Skip to content

Commit 9cc5153

Browse files
committed
fix spacing and padding
1 parent 8f7bf56 commit 9cc5153

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

src/desktopMain/kotlin/ui/App.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ fun App() {
6161
Row {
6262
verticalScroll {
6363
Column(
64-
modifier = Modifier.width(320.dp).padding(16.dp),
64+
modifier = Modifier
65+
.width(320.dp)
66+
.padding(8.dp),
6567
verticalArrangement = Arrangement.SpaceBetween
6668
) {
6769
Column {

src/desktopMain/kotlin/ui/screens/BeatprogressScreen.kt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ui.screens
22

33
import androidx.compose.foundation.Canvas
4+
import androidx.compose.foundation.layout.Arrangement
45
import androidx.compose.foundation.layout.Column
56
import androidx.compose.foundation.layout.FlowRow
67
import androidx.compose.foundation.layout.PaddingValues
@@ -135,13 +136,14 @@ fun beatProgressScreen(
135136

136137
Column {
137138
Row(
138-
modifier = Modifier
139-
// .padding(16.dp, 8.dp)
139+
modifier = Modifier,
140+
// .padding(16.dp, 8.dp),
141+
horizontalArrangement = Arrangement.spacedBy(8.dp)
140142
) {
141143

142144
Column(
143145
modifier = Modifier
144-
// .padding(horizontal = 8.dp)
146+
.padding(horizontal = 8.dp)
145147
) {
146148

147149
Text(
@@ -317,17 +319,17 @@ fun beatProgressScreen(
317319
)
318320
}
319321
}
320-
val maxRange = min(1.0f, 30f / (frame * secondsPerBeat))
322+
// val maxRange = min(1.0f, 30f / (frame * secondsPerBeat))
321323
Row(
322324
// modifier = Modifier.width(200.dp),
323325
verticalAlignment = Alignment.CenterVertically,
324326
) {
325327
Text("Transition Time")
326-
Spacer(Modifier.weight(1.0f))
327-
Text(
328-
text = "max: %3.2f".format(maxRange),
329-
textAlign = TextAlign.Center,
330-
)
328+
// Spacer(Modifier.weight(1.0f))
329+
// Text(
330+
// text = "max: %3.2f".format(maxRange),
331+
// textAlign = TextAlign.Center,
332+
// )
331333
}
332334
decks.forEach { deck ->
333335
if (deck.id > decksEnabled) return@forEach
@@ -337,14 +339,15 @@ fun beatProgressScreen(
337339
val transitTimeSync by deck.presetSwitching.transitTimeSync.collectAsState()
338340
val transitTimeBeats by deck.presetSwitching.transitTimeBeats.collectAsState()
339341
Row(
340-
// modifier = Modifier.width(200.dp),
342+
modifier = Modifier.padding(start = 8.dp),
341343
verticalAlignment = Alignment.Top,
342344
) {
343345

344346
Column(
345347
modifier = Modifier
346-
.width(50.dp)
347-
.padding(horizontal = 8.dp),
348+
// .width(50.dp)
349+
// .padding(horizontal = 8.dp),
350+
,
348351
horizontalAlignment = Alignment.End
349352
) {
350353
Text(

0 commit comments

Comments
 (0)