fixes

JetBrains · Oct 4, 2023 · 39d76a6 · 39d76a6
1 parent 8c8acf7
commit 39d76a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Tooltip.kt b/core/src/main/kotlin/org/jetbrains/jewel/Tooltip.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.DpOffset
@@ -18,7 +19,11 @@ import org.jetbrains.jewel.styling.TooltipStyle
 @Composable
 fun Tooltip(
     modifier: Modifier = Modifier,
-    tooltipPlacement: TooltipPlacement = TooltipPlacement.CursorPoint(offset = DpOffset(16.dp, 16.dp)),
+    tooltipPlacement: TooltipPlacement = TooltipPlacement.ComponentRect(
+        alignment = Alignment.CenterEnd,
+        anchor = Alignment.BottomEnd,
+        offset = DpOffset(4.dp, 4.dp)
+    ),
     style: TooltipStyle = IntelliJTheme.tooltipStyle,
     tooltip: @Composable () -> Unit,
     content: @Composable () -> Unit

diff --git a/...alone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt b/...alone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt
@@ -53,15 +53,15 @@ data class IntUiTooltipColors(
 
         @Composable
         fun light(
-            contentColor: Color = IntUiLightTheme.colors.grey(1),
-            backgroundColor: Color = IntUiLightTheme.colors.grey(12),
+            contentColor: Color = IntUiLightTheme.colors.grey(12),
+            backgroundColor: Color = IntUiLightTheme.colors.grey(2),
             borderColor: Color = IntelliJTheme.globalColors.borders.normal
         ) = IntUiTooltipColors(contentColor, backgroundColor, borderColor)
 
         @Composable
         fun dark(
-            contentColor: Color = IntUiDarkTheme.colors.grey(1),
-            backgroundColor: Color = IntUiDarkTheme.colors.grey(12),
+            contentColor: Color = IntUiDarkTheme.colors.grey(12),
+            backgroundColor: Color = IntUiDarkTheme.colors.grey(2),
             borderColor: Color = IntelliJTheme.globalColors.borders.normal
         ) = IntUiTooltipColors(contentColor, backgroundColor, borderColor)
     }
@@ -70,5 +70,5 @@ data class IntUiTooltipColors(
 @Stable
 data class IntUiTooltipMetrics(
     override val paddingValues: PaddingValues = PaddingValues(vertical = 8.dp, horizontal = 8.dp),
-    override val showDelay: Duration = 500.milliseconds,
+    override val showDelay: Duration = 0.milliseconds,
 ) : TooltipMetrics