From dd8f501e84bf1a159ce15a8c5b7a2a427e784791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Sun, 7 Feb 2021 17:44:59 +0100
Subject: [PATCH] [Editor] Add cursor position to the status bar

---
 .../editor/render/canvas/map/MapPainter.kt    | 15 ++++++--------
 .../base/editor/view/map/MapStatusBarView.kt  | 20 ++++++++++++++-----
 .../editor/viewmodel/map/EditorStateVM.kt     |  6 ++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
index 75181f36..c344e923 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
@@ -21,9 +21,6 @@ class MapPainter(
    private val tileWidth = mapVM.tileSet.tileWidth.toDouble()
    private val tileHeight = mapVM.tileSet.tileHeight.toDouble()
 
-   private var mouseRow = -1
-   private var mouseColumn = -1
-
    private var currentTrace: MapPaintingTrace? = null
 
    override fun render(gc: GraphicsContext) {
@@ -38,8 +35,8 @@ class MapPainter(
    }
 
    private fun renderTile(gc: GraphicsContext, row: Int, column: Int, centerRow: Int, centerColumn: Int, tile: Tile?) {
-      val x = tileWidth * (mouseColumn - centerColumn + column)
-      val y = tileHeight * (mouseRow - centerRow + row)
+      val x = tileWidth * (editorStateVM.cursorColumn - centerColumn + column)
+      val y = tileHeight * (editorStateVM.cursorRow - centerRow + row)
 
       when {
          tile != null -> renderPaintingBrushTile(gc, tile, x, y)
@@ -56,8 +53,8 @@ class MapPainter(
    }
 
    override fun handleMouseInput(event: MapMouseEvent) {
-      mouseRow = event.row
-      mouseColumn = event.column
+      editorStateVM.cursorRowProperty.value = event.row
+      editorStateVM.cursorColumnProperty.value = event.column
 
       when (event.type) {
          MouseEvent.MOUSE_PRESSED -> beginTrace(event)
@@ -70,7 +67,7 @@ class MapPainter(
       if (event.button == MouseButton.PRIMARY && editorStateVM.selectedLayer >= 0) {
          currentTrace = MapPaintingTrace(mapVM, "Paint trace").apply {
             brushVM.forEach { row, column, centerRow, centerColumn, tile ->
-               paint(editorStateVM.selectedLayer, mouseRow - centerRow + row, mouseColumn - centerColumn + column, tile)
+               paint(editorStateVM.selectedLayer, editorStateVM.cursorRow - centerRow + row, editorStateVM.cursorColumn - centerColumn + column, tile)
             }
          }
       }
@@ -80,7 +77,7 @@ class MapPainter(
       if (event.button == MouseButton.PRIMARY) {
          currentTrace?.apply {
             brushVM.forEach { row, column, centerRow, centerColumn, tile ->
-               paint(editorStateVM.selectedLayer, mouseRow - centerRow + row, mouseColumn - centerColumn + column, tile)
+               paint(editorStateVM.selectedLayer, editorStateVM.cursorRow - centerRow + row, editorStateVM.cursorColumn - centerColumn + column, tile)
             }
          }
       }
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt
index a39bcf15..129ff866 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/map/MapStatusBarView.kt
@@ -10,15 +10,25 @@ class MapStatusBarView : View() {
    private val editorStateVM = find<EditorStateVM>()
 
    override val root = hbox {
-      spacing = 1.0
+      spacing = 50.0
       paddingAll = 5.0
 
-      this += FontIcon("fa-search-minus")
+      hbox {
+         this += FontIcon("fa-search-minus")
 
-      slider(0.5..5.0) {
-         bind(editorStateVM.zoomProperty)
+         slider(0.5..5.0) {
+            bind(editorStateVM.zoomProperty)
+         }
+
+         this += FontIcon("fa-search-plus")
       }
 
-      this += FontIcon("fa-search-plus")
+      label(
+         Bindings.format(
+            "Cursor: %d, %d",
+            editorStateVM.cursorColumnProperty.add(1),
+            editorStateVM.cursorRowProperty.add(1)
+         )
+      )
    }
 }
\ No newline at end of file
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
index fd621cd8..106e0920 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/EditorStateVM.kt
@@ -19,4 +19,10 @@ class EditorStateVM : ViewModel() {
 
    val zoomProperty = SimpleDoubleProperty(1.0)
    var zoom by zoomProperty
+
+   val cursorRowProperty = SimpleIntegerProperty(-1)
+   val cursorRow by cursorRowProperty
+
+   val cursorColumnProperty = SimpleIntegerProperty(-1)
+   val cursorColumn by cursorColumnProperty
 }
\ No newline at end of file