- Align the toolbar heights in the table and in the chart

- It seems that we don't need to listen to the application font in the table header anymore.
bardsoftware · Oct 1, 2024 · 96c22ad · 96c22ad
1 parent 23728db
commit 96c22ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/ganttproject/src/main/java/biz/ganttproject/app/ViewPane.kt b/ganttproject/src/main/java/biz/ganttproject/app/ViewPane.kt
@@ -21,6 +21,7 @@ package biz.ganttproject.app
 import biz.ganttproject.FXUtil
 import biz.ganttproject.core.option.IntegerOption
 import biz.ganttproject.lib.fx.vbox
+import javafx.beans.property.SimpleDoubleProperty
 import javafx.embed.swing.SwingNode
 import javafx.geometry.Orientation
 import javafx.geometry.Rectangle2D
@@ -33,6 +34,7 @@ import javafx.scene.image.Image
 import javafx.scene.image.ImageView
 import javafx.scene.layout.Pane
 import javafx.scene.layout.Priority
+import javafx.scene.layout.Region
 import net.sourceforge.ganttproject.action.GPAction
 import net.sourceforge.ganttproject.chart.Chart
 import net.sourceforge.ganttproject.gui.UIFacade
@@ -152,9 +154,9 @@ data class ViewComponents(val image: Pane, val splitPane: SplitPane, val table:
 }
 
 fun createViewComponents(
-  tableToolbarBuilder: ()->Node,
+  tableToolbarBuilder: ()-> Region,
   tableBuilder: ()->Node,
-  chartToolbarBuilder: ()->Node,
+  chartToolbarBuilder: ()-> Region,
   chartBuilder: ()-> JComponent,
   dpiOption: IntegerOption): ViewComponents {
 
@@ -172,16 +174,31 @@ fun createViewComponents(
 
   val table = tableBuilder()
   val splitPane = SplitPane().also {split ->
+    var maxToolbarHeight = SimpleDoubleProperty(0.0)
     split.orientation = Orientation.HORIZONTAL
     split.items.add(vbox {
-      add(tableToolbarBuilder())
+      add(tableToolbarBuilder().also {
+        it.heightProperty().subscribe { v ->
+          if (v.toDouble() > maxToolbarHeight.value) {
+            maxToolbarHeight.value = v.toDouble()
+          }
+        }
+        it.prefHeightProperty().bind(maxToolbarHeight)
+      })
       add(imagePane)
       add(table, null, growth = Priority.ALWAYS)
     })
 
     val swingNode = SwingNode()
     val right = vbox {
-      add(chartToolbarBuilder())
+      add(chartToolbarBuilder().also {
+        it.heightProperty().subscribe { v ->
+          if (v.toDouble() > maxToolbarHeight.value) {
+            maxToolbarHeight.value = v.toDouble()
+          }
+        }
+        it.prefHeightProperty().bind(maxToolbarHeight)
+      })
       add(swingNode, null, Priority.ALWAYS)
     }
     SwingUtilities.invokeLater { swingNode.content = chartBuilder() }

diff --git a/ganttproject/src/main/java/biz/ganttproject/lib/fx/treetable/TableColumnHeader.java b/ganttproject/src/main/java/biz/ganttproject/lib/fx/treetable/TableColumnHeader.java
@@ -582,7 +582,7 @@ private void initUI() {
     // when they change in the settings.
     // Also, there is an attempt to set the background color to the value from Swing LAF, but I am not sure
     // if it is working properly.
-    label.fontProperty().bind(FontKt.getApplicationFont());
+    //label.fontProperty().bind(FontKt.getApplicationFont());
     label.textFillProperty().bind(TreeTableCellsKt.getApplicationForeground());
   }