From 42de14aabee300298dab3219cf25d784ab58fbed Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 26 Sep 2023 08:40:55 +0200 Subject: [PATCH] early-access version 3897 --- README.md | 2 +- .../yuzu_emu/features/settings/ui/SettingsActivity.kt | 10 ++++++---- .../app/src/main/res/layout/activity_settings.xml | 2 +- .../app/src/main/res/layout/fragment_emulation.xml | 5 +++-- src/common/settings_setting.h | 2 ++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 25dbf66ef..0539d6df4 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3896. +This is the source code for early-access 3897. ## Legal Notice diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt index 4d2f2f604..ea26a21d0 100755 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt @@ -181,12 +181,14 @@ class SettingsActivity : AppCompatActivity() { private fun setInsets() { ViewCompat.setOnApplyWindowInsetsListener( binding.navigationBarShade - ) { view: View, windowInsets: WindowInsetsCompat -> + ) { _: View, windowInsets: WindowInsetsCompat -> val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - val mlpShade = view.layoutParams as MarginLayoutParams - mlpShade.height = barInsets.bottom - view.layoutParams = mlpShade + // The only situation where we care to have a nav bar shade is when it's at the bottom + // of the screen where scrolling list elements can go behind it. + val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams + mlpNavShade.height = barInsets.bottom + binding.navigationBarShade.layoutParams = mlpNavShade windowInsets } diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml index 8a026a30a..a187665f2 100755 --- a/src/android/app/src/main/res/layout/activity_settings.xml +++ b/src/android/app/src/main/res/layout/activity_settings.xml @@ -22,7 +22,7 @@ + android:focusable="false" + android:clickable="false"> diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h index 7be6f26f7..3175ab07d 100755 --- a/src/common/settings_setting.h +++ b/src/common/settings_setting.h @@ -187,6 +187,8 @@ public: this->SetValue(input == "true"); } else if constexpr (std::is_same_v) { this->SetValue(std::stof(input)); + } else if constexpr (std::is_same_v) { + this->SetValue(ToEnum(input)); } else { this->SetValue(static_cast(std::stoll(input))); }