Bottom insets for LabelPosition.Bottom and ask for super's insets in …

…Marker.kt
patrykandpatrick · May 23, 2024 · f56e3fd · f56e3fd
1 parent 46c56ad
commit f56e3fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt
@@ -101,14 +101,18 @@ internal fun rememberMarker(
                 horizontalDimensions: HorizontalDimensions,
             ) {
                 with(context) {
-                    outInsets.top =
+                    super.getInsets(context, outInsets, horizontalDimensions)
+                    val shadowClipping =
                         (
                             CLIPPING_FREE_SHADOW_RADIUS_MULTIPLIER * LABEL_BACKGROUND_SHADOW_RADIUS_DP -
                                 LABEL_BACKGROUND_SHADOW_DY_DP
                         )
                             .pixels
-                    if (labelPosition == LabelPosition.AroundPoint) return
-                    outInsets.top += label.getHeight(context) + labelBackgroundShape.tickSizeDp.pixels
+                    when (labelPosition) {
+                        LabelPosition.Top -> outInsets.top += shadowClipping
+                        LabelPosition.Bottom -> outInsets.bottom += shadowClipping
+                        LabelPosition.AroundPoint, LabelPosition.AbovePoint -> Unit
+                    }
                 }
             }
         }

diff --git a/...e/src/main/java/com/patrykandpatrick/vico/core/cartesian/marker/DefaultCartesianMarker.kt b/...e/src/main/java/com/patrykandpatrick/vico/core/cartesian/marker/DefaultCartesianMarker.kt
@@ -191,8 +191,17 @@ public open class DefaultCartesianMarker(
         outInsets: Insets,
         horizontalDimensions: HorizontalDimensions,
     ) {
-        if (labelPosition == LabelPosition.AroundPoint) return
-        with(context) { outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels }
+        when (labelPosition) {
+            LabelPosition.Top, LabelPosition.AbovePoint -> with(context) {
+                outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels
+            }
+
+            LabelPosition.Bottom -> with(context) {
+                outInsets.bottom = label.getHeight(context) + label.tickSizeDp.pixels
+            }
+
+            LabelPosition.AroundPoint -> Unit // Will be inside the chart
+        }
     }
 
     /** Specifies the position of a [DefaultCartesianMarker]’s label. */