Fix #1051: vjust on livemap.

JetBrains · Mar 20, 2024 · a1c1066 · a1c1066
1 parent 999952d
commit a1c1066
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/future_changes.md b/future_changes.md
@@ -9,3 +9,4 @@
 - livemap: when release the mouse button from outside the map, it gets stuck in panning mode [[#1044](https://github.com/JetBrains/lets-plot/issues/1044)].
 - Incorrect 'plot_background' area (with empty space capture) [[#918](https://github.com/JetBrains/lets-plot/issues/918)].
 - Support arrow() in geom_spoke() [[#986](https://github.com/JetBrains/lets-plot/issues/986)].
+- Livemap: `vjust` implemented incorrectly [[#1051](https://github.com/JetBrains/lets-plot/issues/1051)].
diff --git a/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/text/TextRenderer.kt b/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/text/TextRenderer.kt
@@ -54,8 +54,8 @@ class TextRenderer : Renderer {
  } else {
  val yPosition = with(textSpec) {
  when (vjust) {
- 1.0 -> font.fontSize * 0.7
- 0.0 -> -textSize.y + font.fontSize
+ 0.0 -> font.fontSize * 0.7
+ 1.0 -> -textSize.y + font.fontSize
  else -> -textSize.y / 2 + font.fontSize * 0.8
  }
  }

diff --git a/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/text/TextSpec.kt b/livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/chart/text/TextSpec.kt
@@ -62,7 +62,7 @@ class TextSpec(
  val height = textSize.y + padding * 2
  rectangle = DoubleRectangle(
  -width * hjust,
- -height * (1 - vjust),
+ -height * vjust,
  width,
  height
  )