The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-16 20:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the original view padding/margin when applying window insets

Browse Source 
Adding to the current view padding/margin values results in applying the insets over and over again as insets listeners can be called multiple times.
This commit is contained in:
lynxnb 2022-11-28 00:04:39 +01:00
parent b2384e83f5
commit 2e8d7b559c
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/emu/skyline/utils/WindowInsetsHelper.kt
View File

@ -7,9 +7,7 @@ package emu.skyline.utils
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.ViewCompat import androidx.core.view.*
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updateLayoutParams
/** /**
* An interface to easily add window insets handling to any layout * An interface to easily add window insets handling to any layout
@ -44,13 +42,21 @@ interface WindowInsetsHelper {
} }
fun addMargin(view : View, consume : Boolean = true, left : Boolean = false, top : Boolean = false, right : Boolean = false, bottom : Boolean = false) { fun addMargin(view : View, consume : Boolean = true, left : Boolean = false, top : Boolean = false, right : Boolean = false, bottom : Boolean = false) {
// Save initial margin values to avoid adding to the initial margin multiple times
val baseMargin = object {
val left = view.marginLeft
val top = view.marginTop
val right = view.marginRight
val bottom = view.marginBottom
}
ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets -> ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
v.updateLayoutParams<ViewGroup.MarginLayoutParams> { v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
if (left) leftMargin += insets.left if (left) leftMargin = baseMargin.left + insets.left
if (top) topMargin += insets.top if (top) topMargin = baseMargin.top + insets.top
if (right) rightMargin += insets.right if (right) rightMargin = baseMargin.right + insets.right
if (bottom) bottomMargin += insets.bottom if (bottom) bottomMargin = baseMargin.bottom + insets.bottom
} }
if (consume) WindowInsetsCompat.CONSUMED else windowInsets if (consume) WindowInsetsCompat.CONSUMED else windowInsets
} }
@ -70,13 +76,21 @@ interface WindowInsetsHelper {
} }
fun addPadding(view : View, consume : Boolean = true, left : Boolean = false, top : Boolean = false, right : Boolean = false, bottom : Boolean = false) { fun addPadding(view : View, consume : Boolean = true, left : Boolean = false, top : Boolean = false, right : Boolean = false, bottom : Boolean = false) {
// Save initial padding values to avoid adding to the initial padding multiple times
val basePadding = object {
val left = view.paddingLeft
val top = view.paddingTop
val right = view.paddingRight
val bottom = view.paddingBottom
}
ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets -> ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding( v.setPadding(
if (left) insets.left + v.paddingLeft else v.paddingLeft, if (left) basePadding.left + insets.left else basePadding.left,
if (top) insets.top + v.paddingTop else v.paddingTop, if (top) basePadding.top + insets.top else basePadding.top,
if (right) insets.right + v.paddingRight else v.paddingRight, if (right) basePadding.right + insets.right else basePadding.right,
if (bottom) insets.bottom + v.paddingBottom else v.paddingBottom if (bottom) basePadding.bottom + insets.bottom else basePadding.bottom
) )
if (consume) WindowInsetsCompat.CONSUMED else windowInsets if (consume) WindowInsetsCompat.CONSUMED else windowInsets
} }