summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-05-01 23:12:07 +0200
committerbunnei <bunneidev@gmail.com>2023-06-03 09:05:58 +0200
commit34b7d58157a3180aed3261c92a8ff43fce22ddc0 (patch)
treeb54144f59afdd4d86faa3bdb93a6143ea8497987 /src
parentandroid: Use short build hash (diff)
downloadyuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar.gz
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar.bz2
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar.lz
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar.xz
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.tar.zst
yuzu-34b7d58157a3180aed3261c92a8ff43fce22ddc0.zip
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt17
-rw-r--r--src/android/app/src/main/res/layout/fragment_home_settings.xml2
2 files changed, 14 insertions, 5 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
index c7427e151..ae920d692 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@@ -13,6 +13,7 @@ import android.provider.DocumentsContract
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
@@ -241,13 +242,19 @@ class HomeSettingsFragment : Fragment() {
val spacingNavigationRail =
resources.getDimensionPixelSize(R.dimen.spacing_navigation_rail)
- binding.scrollViewSettings.setPadding(
- barInsets.left + cutoutInsets.left,
- barInsets.top,
- barInsets.right + cutoutInsets.right,
- barInsets.bottom
+ val leftInsets = barInsets.left + cutoutInsets.left
+ val rightInsets = barInsets.right + cutoutInsets.right
+
+ binding.scrollViewSettings.updatePadding(
+ top = barInsets.top,
+ bottom = barInsets.bottom
)
+ val mlpScrollSettings = binding.scrollViewSettings.layoutParams as MarginLayoutParams
+ mlpScrollSettings.leftMargin = leftInsets
+ mlpScrollSettings.rightMargin = rightInsets
+ binding.scrollViewSettings.layoutParams = mlpScrollSettings
+
binding.linearLayoutSettings.updatePadding(bottom = spacingNavigation)
if (ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_LTR) {
diff --git a/src/android/app/src/main/res/layout/fragment_home_settings.xml b/src/android/app/src/main/res/layout/fragment_home_settings.xml
index 82b037010..02200e885 100644
--- a/src/android/app/src/main/res/layout/fragment_home_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_home_settings.xml
@@ -5,6 +5,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
+ android:scrollbars="vertical"
+ android:fadeScrollbars="false"
android:clipToPadding="false">
<androidx.appcompat.widget.LinearLayoutCompat