PavelBARABANOV
6 days ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
5 additions and
5 deletions
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
-
src/android/app/src/main/jni/android_settings.h
|
|
|
@ -284,8 +284,6 @@ class SettingsFragmentPresenter( |
|
|
|
add(BooleanSetting.SYNC_MEMORY_OPERATIONS.key) |
|
|
|
add(BooleanSetting.RENDERER_USE_DISK_SHADER_CACHE.key) |
|
|
|
add(BooleanSetting.RENDERER_FORCE_MAX_CLOCK.key) |
|
|
|
add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key) |
|
|
|
add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key) |
|
|
|
add(BooleanSetting.RENDERER_REACTIVE_FLUSHING.key) |
|
|
|
add(BooleanSetting.ENABLE_BUFFER_HISTORY.key) |
|
|
|
add(BooleanSetting.USE_OPTIMIZED_VERTEX_BUFFERS.key) |
|
|
|
@ -296,6 +294,8 @@ class SettingsFragmentPresenter( |
|
|
|
add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key) |
|
|
|
add(BooleanSetting.FIX_BLOOM_EFFECTS.key) |
|
|
|
add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key) |
|
|
|
add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key) |
|
|
|
add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key) |
|
|
|
add(SettingsItem.GPU_UNSWIZZLE_COMBINED) |
|
|
|
|
|
|
|
add(HeaderSetting(R.string.extensions)) |
|
|
|
|
|
|
|
@ -2509,7 +2509,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { |
|
|
|
|
|
|
|
fun toggleOverlay(enable: Boolean) { |
|
|
|
if (!isAdded || _binding == null) return |
|
|
|
if (enable && hasPhysicalControllerConnected && !args.overlayGamelessEditMode) return |
|
|
|
if (enable == !BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) { |
|
|
|
// Reset controller input flag so controller can hide overlay again |
|
|
|
if (!enable) { |
|
|
|
@ -2547,7 +2546,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { |
|
|
|
if (binding.surfaceInputOverlay.isGamelessMode()) return |
|
|
|
|
|
|
|
if (hasConnectedControllers) { |
|
|
|
if (BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) { |
|
|
|
if (BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean() && |
|
|
|
BooleanSetting.HIDE_OVERLAY_ON_CONTROLLER_INPUT.getBoolean()) { |
|
|
|
overlayHiddenByPhysicalController = true |
|
|
|
toggleOverlay(false) |
|
|
|
} |
|
|
|
|
|
|
|
@ -95,7 +95,7 @@ namespace AndroidSettings { |
|
|
|
Settings::Setting<u32> input_overlay_auto_hide{linkage, 5, "input_overlay_auto_hide", |
|
|
|
Settings::Category::Overlay, |
|
|
|
Settings::Specialization::Default, true, true, &enable_input_overlay_auto_hide}; |
|
|
|
Settings::Setting<bool> hide_overlay_on_controller_input{linkage, false, |
|
|
|
Settings::Setting<bool> hide_overlay_on_controller_input{linkage, true, |
|
|
|
"hide_overlay_on_controller_input", |
|
|
|
Settings::Category::Overlay, |
|
|
|
Settings::Specialization::Default, true, |
|
|
|
|