fixed some bugs with a bottom tool panel.

Author: JavaSaBr

resources/ui/css/custom_ids.bss

@@ -8,6 +8,10 @@
     -fx-effect: -fx-material-shadow-panel;;
 }
 
+#EditorBarComponentOffset {
+    -fx-min-height: 34px;
+}
+
 #EditorBarComponentTitleLabel {
     -fx-padding: 0 0 0 20;
 }

resources/ui/css/custom_ids.css

@@ -15,12 +15,12 @@
 import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.ui.event.EventRedirector;
 import com.ss.editor.ui.scene.EditorFXScene;
-import javafx.application.Platform;
 import javafx.collections.ObservableList;
-import javafx.geometry.Insets;
 import javafx.scene.Group;
 import javafx.scene.canvas.Canvas;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import org.jetbrains.annotations.NotNull;
 import rlib.ui.util.FXUtils;
@@ -92,6 +92,7 @@ private static void build(@NotNull final EditorFXScene scene, @NotNull final Sta
 
         final GlobalLeftToolSplitPane leftSplitContainer = new GlobalLeftToolSplitPane(scene);
         leftSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
+        leftSplitContainer.prefHeightProperty().bind(container.heightProperty());
 
         final GlobalBottomToolSplitPane bottomSplitContainer = new GlobalBottomToolSplitPane(scene);
         bottomSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
@@ -105,29 +106,17 @@ private static void build(@NotNull final EditorFXScene scene, @NotNull final Sta
         leftSplitContainer.initFor(globalLeftToolComponent, bottomSplitContainer);
         bottomSplitContainer.initFor(globalBottomToolComponent, editorAreaComponent);
 
-        FXUtils.addToPane(leftSplitContainer, container);
+        final Pane editorBarOffset = new Pane();
+        editorBarOffset.setId(CSSIds.EDITOR_BAR_COMPONENT_OFFSET);
+
+        FXUtils.addToPane(new VBox(editorBarOffset, leftSplitContainer), container);
         FXUtils.addToPane(barComponent, container);
 
         barComponent.createDrawer(container, stage);
         barComponent.toFront();
 
+        FXUtils.bindFixedWidth(editorBarOffset, container.widthProperty());
         FXUtils.bindFixedWidth(leftSplitContainer, container.widthProperty());
         FXUtils.bindFixedWidth(barComponent, container.widthProperty());
-
-        barComponent.heightProperty().addListener((observable, oldValue, newValue) ->
-                updateLayout(container, leftSplitContainer, newValue));
-    }
-
-    private static void updateLayout(@NotNull final StackPane container,
-                                     @NotNull final GlobalLeftToolSplitPane leftSplitContainer,
-                                     @NotNull final Number newValue) {
-
-        StackPane.setMargin(leftSplitContainer, new Insets(newValue.doubleValue(), 0, 0, 0));
-        FXUtils.bindFixedHeight(leftSplitContainer, container.heightProperty().subtract(newValue.doubleValue()).add(2));
-
-        Platform.runLater(() -> {
-            container.requestLayout();
-            Platform.runLater(container::requestLayout);
-        });
     }
 }

src/com/ss/editor/ui/builder/EditorFXSceneBuilder.java

@@ -26,7 +26,7 @@ protected void addElements(final @NotNull TabToolComponent toolComponent, final
     }
 
     @Override
-    protected void addWidthListener(@NotNull final TabToolComponent toolComponent) {
+    protected void addListeners(@NotNull final TabToolComponent toolComponent) {
         toolComponent.heightProperty().addListener((observable, oldValue, newValue) -> handleToolChanged(newValue));
     }
 

src/com/ss/editor/ui/component/split/pane/GlobalBottomToolSplitPane.java

@@ -107,15 +107,15 @@ public C getConfig() {
     public void initFor(@NotNull final TabToolComponent toolComponent, @NotNull final Node other) {
         this.toolComponent = toolComponent;
         addElements(toolComponent, other);
-        addWidthListener(toolComponent);
+        addListeners(toolComponent);
         bindToScene();
         update();
     }
 
     /**
      * Add with listener to handle width changes.
      */
-    protected void addWidthListener(@NotNull final TabToolComponent toolComponent) {
+    protected void addListeners(@NotNull final TabToolComponent toolComponent) {
         toolComponent.widthProperty()
                 .addListener((observable, oldValue, newValue) -> handleToolChanged(newValue));
     }

src/com/ss/editor/ui/component/split/pane/TabToolSplitPane.java

@@ -10,6 +10,7 @@ public interface CSSIds {
     String ROOT = "Root";
 
     String EDITOR_BAR_COMPONENT = "EditorBarComponent";
+    String EDITOR_BAR_COMPONENT_OFFSET = "EditorBarComponentOffset";
     String EDITOR_BAR_COMPONENT_TITLE_LABEL = "EditorBarComponentTitleLabel";
     String EDITOR_BAR_COMPONENT_MENU_BUTTON = "EditorBarComponentMenuButton";
     String EDITOR_BAR_COMPONENT_FULLSCREEN_BUTTON = "EditorBarComponentFullscreenButton";