Skip to content

Commit 3b52d10

Browse files
committed
fix imports breaking compilation
1 parent 064de97 commit 3b52d10

File tree

4 files changed

+268
-182
lines changed

4 files changed

+268
-182
lines changed

src/desktopMain/kotlin/ui/components/Tooltip.kt

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ import androidx.compose.ui.unit.dp
1717

1818
@OptIn(ExperimentalFoundationApi::class)
1919
@Composable
20-
fun WithTooltip(
20+
fun WithTooltipAtPointer(
2121
tooltip: @Composable () -> Unit,
2222
content: @Composable () -> Unit
2323
) {
2424
TooltipArea(
2525
tooltip = {
2626
Surface(
2727
modifier = Modifier.shadow(4.dp),
28-
color = MaterialTheme.colors.surface,
28+
color = MaterialTheme.colors.background,
2929
shape = RoundedCornerShape(4.dp),
30+
elevation = 2.dp
3031
// border = BorderStroke(width = 1.dp, Color.White)
3132
) {
3233
Box(
@@ -36,8 +37,8 @@ fun WithTooltip(
3637
}
3738
}
3839
},
39-
modifier = Modifier.padding(start = 40.dp),
40-
delayMillis = 600, // In milliseconds
40+
modifier = Modifier, //.padding(start = 40.dp),
41+
delayMillis = 100, // In milliseconds
4142
tooltipPlacement = TooltipPlacement.CursorPoint(
4243
alignment = Alignment.BottomEnd,
4344
offset = DpOffset(
@@ -46,6 +47,39 @@ fun WithTooltip(
4647
),
4748
)
4849
) {
49-
content()
50+
content()
51+
}
52+
}
53+
@OptIn(ExperimentalFoundationApi::class)
54+
@Composable
55+
fun WithTooltipAbove(
56+
tooltip: @Composable () -> Unit,
57+
content: @Composable () -> Unit
58+
) {
59+
TooltipArea(
60+
tooltip = {
61+
Surface(
62+
modifier = Modifier.shadow(4.dp),
63+
color = MaterialTheme.colors.background,
64+
shape = RoundedCornerShape(4.dp),
65+
elevation = 2.dp
66+
// border = BorderStroke(width = 1.dp, Color.White)
67+
) {
68+
Box(
69+
modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
70+
) {
71+
tooltip()
72+
}
73+
}
74+
},
75+
modifier = Modifier, //.padding(start = 40.dp),
76+
delayMillis = 100, // In milliseconds
77+
tooltipPlacement = TooltipPlacement.ComponentRect(
78+
anchor = Alignment.TopCenter,
79+
alignment = Alignment.TopCenter,
80+
offset = DpOffset(0.dp, 0.dp),
81+
)
82+
) {
83+
content()
5084
}
5185
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ import androidx.compose.ui.graphics.drawscope.Stroke
3535
import androidx.compose.ui.graphics.drawscope.rotate
3636
import androidx.compose.ui.graphics.luminance
3737
import androidx.compose.ui.platform.LocalDensity
38-
import androidx.compose.ui.text.font.FontFamily
39-
import androidx.compose.ui.text.font.FontListFontFamily
40-
import androidx.compose.ui.text.font.FontStyle
41-
import androidx.compose.ui.text.font.FontVariation
42-
import androidx.compose.ui.text.font.FontWeight
43-
import androidx.compose.ui.text.font.toFontFamily
44-
import androidx.compose.ui.text.platform.Font
45-
import androidx.compose.ui.text.platform.LoadedFont
4638
import androidx.compose.ui.text.style.TextAlign
4739
import androidx.compose.ui.unit.Dp
4840
import androidx.compose.ui.unit.dp
@@ -51,12 +43,8 @@ import beatProgress
5143
import bpmInt
5244
import kotlinx.coroutines.CoroutineScope
5345
import kotlinx.coroutines.launch
54-
import nestctrl.generated.resources.DSEG14Classic_Regular
55-
import nestctrl.generated.resources.DSEG14_Classic
56-
import nestctrl.generated.resources.Res
5746
import nestdrop.deck.Deck
5847
import ui.components.Dseg14ClassicFontFamily
59-
import utils.className
6048
import kotlin.math.max
6149
import kotlin.math.min
6250
import kotlin.math.pow

0 commit comments

Comments
 (0)