edvin#801 Remove the grid row id key property on when removing the si…

…ngle row Thinking more it feels like the better approach to remove the property rather than going to -1 value.
zshamrock · Sep 16, 2018 · 5118b48 · 5118b48
1 parent 59212b5
commit 5118b48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/tornadofx/Layouts.kt b/src/main/java/tornadofx/Layouts.kt
@@ -41,8 +41,12 @@ fun GridPane.row(title: String? = null, op: Pane.() -> Unit = {}) {
  * @return the row index of the removed row.
  */
 fun GridPane.removeRow(node: Node): Int {
-    if (properties.containsKey(GridPaneRowIdKey)) {
-        properties[GridPaneRowIdKey] = properties[GridPaneRowIdKey] as Int - 1
+    val rowIdKey = properties[GridPaneRowIdKey] as Int?
+    if (rowIdKey != null) {
+        when (rowIdKey) {
+            0 -> properties.remove(GridPaneRowIdKey)
+            else -> properties[GridPaneRowIdKey] = rowIdKey - 1
+        }
     }
     val rowIndex = GridPane.getRowIndex(node) ?: 0
     val nodesToDelete = mutableListOf<Node>()

diff --git a/src/test/kotlin/tornadofx/tests/LayoutsTest.kt b/src/test/kotlin/tornadofx/tests/LayoutsTest.kt
@@ -138,7 +138,7 @@ class RegionTest {
 
             root.removeRow(label)
 
-            assertEquals(root.properties[GridPaneRowIdKey], -1)
+            assertFalse(root.properties.containsKey(GridPaneRowIdKey))
             assertNull(GridPane.getRowIndex(label))
             assertNull(GridPane.getColumnIndex(label))
             assertEquals(root.children, emptyList<Node>().observable())