Skip to content

Commit 9e490a2

Browse files
committed
Fixed horizontal server type selection
1 parent 314fbdf commit 9e490a2

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/settings/LibrarySettingsView.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.lasthopesoftware.bluewater.client.settings
22

3-
import androidx.compose.foundation.ScrollState
43
import androidx.compose.foundation.background
54
import androidx.compose.foundation.layout.Arrangement
65
import androidx.compose.foundation.layout.Box
@@ -16,7 +15,6 @@ import androidx.compose.foundation.layout.heightIn
1615
import androidx.compose.foundation.layout.padding
1716
import androidx.compose.foundation.layout.requiredWidth
1817
import androidx.compose.foundation.layout.width
19-
import androidx.compose.foundation.layout.wrapContentHeight
2018
import androidx.compose.foundation.rememberScrollState
2119
import androidx.compose.foundation.selection.selectableGroup
2220
import androidx.compose.foundation.text.KeyboardOptions
@@ -717,7 +715,7 @@ private fun ColumnScope.LibrarySettings(
717715
librarySettingsViewModel = librarySettingsViewModel,
718716
undoBackStack = undoBackStack,
719717
onServerTypeSelectionFinished = onServerTypeSelectionFinished,
720-
modifier = Modifier.wrapContentHeight().weight(1f)
718+
modifier = Modifier.weight(1f)
721719
)
722720
} else {
723721
val connectionSettingsViewModelState by librarySettingsViewModel.savedConnectionSettingsViewModel.subscribeAsState()
@@ -741,7 +739,7 @@ private fun ColumnScope.LibrarySettings(
741739
librarySettingsViewModel = librarySettingsViewModel,
742740
undoBackStack = undoBackStack,
743741
onServerTypeSelectionFinished = onServerTypeSelectionFinished,
744-
modifier = Modifier.wrapContentHeight().weight(1f)
742+
modifier = Modifier.weight(1f)
745743
)
746744
}
747745
}
@@ -1014,7 +1012,7 @@ fun ScreenDimensionsScope.LibrarySettingsView(
10141012

10151013
if (!isLoadingState) {
10161014
Column(
1017-
modifier = Modifier.fillMaxWidth().verticalScroll(remember { ScrollState(0) }),
1015+
modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
10181016
horizontalAlignment = Alignment.CenterHorizontally,
10191017
) {
10201018
LibrarySettings(

0 commit comments

Comments
 (0)