diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-21 12:36:23 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-21 12:36:23 +0100 |
| commit | 57085fcfd2218d7405b3c9b938824a4e99ab8476 (patch) | |
| tree | f0a0648fd44dc5a4063805ba9f57438a6d0740f9 /android/app | |
| parent | af8439aa618c5c19a67ca32531d185c34d0fbe7f (diff) | |
| parent | 0b9109bcd37a56741bd28955d3f523074617ea51 (diff) | |
| download | mullvadvpn-57085fcfd2218d7405b3c9b938824a4e99ab8476.tar.xz mullvadvpn-57085fcfd2218d7405b3c9b938824a4e99ab8476.zip | |
Merge branch 'flickering-in-scrollable-views-with-collapsible-toolbar-droid-517'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt index 11abdad191..ce8507db64 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt @@ -144,7 +144,7 @@ fun ScaffoldWithMediumTopBar( title = appBarTitle, navigationIcon = navigationIcon, actions, - scrollBehavior = if (canScroll) scrollBehavior else null + scrollBehavior = scrollBehavior ) }, content = { @@ -180,12 +180,7 @@ fun ScaffoldWithMediumTopBar( title = appBarTitle, navigationIcon = navigationIcon, actions, - scrollBehavior = - if (canScroll) { - scrollBehavior - } else { - null - } + scrollBehavior = scrollBehavior ) }, content = { |