moved log view to bottom.

Author: JavaSaBr

resources/ui/css/base.bss

@@ -544,7 +544,6 @@
 }
 
 .tab-pane > .tab-header-area > .tab-header-background {
-    /* TODO should not be using text-box-border I think? */
     -fx-background-color: -fx-background-background;
 }
 
@@ -553,7 +552,7 @@
 }
 
 .tab-pane:bottom > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 1 0 0 0, 1;
+    -fx-background-insets: 0; /* 0, 0 1 0 0, 1 */
 }
 
 .tab-pane:left > .tab-header-area > .tab-header-background {
@@ -570,7 +569,7 @@
 }
 
 .tab-pane:bottom > .tab-header-area {
-    -fx-padding: 0 0.166667em 0.416667em 0.416667em; /* 0 2 5 5 */
+    -fx-padding: 0; /* 5 0 2 5 */
 }
 
 .tab-pane:left > .tab-header-area {

resources/ui/css/base.css

@@ -55,11 +55,16 @@
     -fx-background-color: transparent;
 }
 
-#GlobalToolComponent {
+#GlobalLeftToolComponent {
     -fx-min-width: 26;
     -fx-tab-max-height: 18;
 }
 
+#GlobalBottomToolComponent {
+    -fx-min-height: 26;
+    -fx-tab-max-height: 18;
+}
+
 #AssetComponent {
     -fx-background-color: -fx-background-background;
     -fx-alignment: top-center;

resources/ui/css/custom_ids.bss

@@ -64,8 +64,10 @@ public final class EditorConfig implements AssetEventListener {
 
     private static final String PREF_ADDITIONAL_CLASSPATH = ASSET_OTHER + "." + "additionalClasspath";
     private static final String PREF_ADDITIONAL_ENVS = ASSET_OTHER + "." + "additionalEnvs";
-    private static final String PREF_GLOBAL_TOOL_WIDTH = ASSET_OTHER + "." + "globalToolWidth";
-    private static final String PREF_GLOBAL_TOOL_COLLAPSED = ASSET_OTHER + "." + "globalToolCollapsed";
+    private static final String PREF_GLOBAL_LEFT_TOOL_WIDTH = ASSET_OTHER + "." + "globalLeftToolWidth";
+    private static final String PREF_GLOBAL_LEFT_TOOL_COLLAPSED = ASSET_OTHER + "." + "globalLeftToolCollapsed";
+    private static final String PREF_GLOBAL_BOTTOM_TOOL_WIDTH = ASSET_OTHER + "." + "globalBottomToolWidth";
+    private static final String PREF_GLOBAL_BOTTOM_TOOL_COLLAPSED = ASSET_OTHER + "." + "globalBottomToolCollapsed";
     private static final String PREF_ANALYTICS = ASSET_OTHER + "." + "analytics";
     private static final String PREF_AUTO_TANGENT_GENERATING = ASSET_EDITING + "." + "autoTangentGenerating";
     private static final String PREF_DEFAULT_USE_FLIPPED_TEXTURE = ASSET_EDITING + "." + "defaultUseFlippedTexture";
@@ -145,14 +147,24 @@ public static EditorConfig getInstance() {
     private volatile int screenHeight;
 
     /**
-     * The global tool width.
+     * The global left tool width.
      */
-    private volatile int globalToolWidth;
+    private volatile int globalLeftToolWidth;
 
     /**
-     * Flag is for collapsing the global tool.
+     * The global bottom tool width.
      */
-    private volatile boolean globalToolCollapsed;
+    private volatile int globalBottomToolWidth;
+
+    /**
+     * Flag is for collapsing the global left tool.
+     */
+    private volatile boolean globalLeftToolCollapsed;
+
+    /**
+     * Flag is for collapsing the global bottom tool.
+     */
+    private volatile boolean globalBottomToolCollapsed;
 
     /**
      * Flag is for enabling the FXAA.
@@ -444,35 +456,67 @@ public void setDecorated(final boolean decorated) {
     }
 
     /**
-     * @return the global tool width.
+     * @return the global left tool width.
+     */
+    @FromAnyThread
+    public int getGlobalLeftToolWidth() {
+        return globalLeftToolWidth;
+    }
+
+    /**
+     * @return the global bottom tool width.
+     */
+    @FromAnyThread
+    public int getGlobalBottomToolWidth() {
+        return globalBottomToolWidth;
+    }
+
+    /**
+     * @param globalLeftToolWidth the global left tool width.
+     */
+    @FromAnyThread
+    public void setGlobalLeftToolWidth(final int globalLeftToolWidth) {
+        this.globalLeftToolWidth = globalLeftToolWidth;
+    }
+
+    /**
+     * @param globalBottomToolWidth the global bottom tool width.
+     */
+    @FromAnyThread
+    public void setGlobalBottomToolWidth(final int globalBottomToolWidth) {
+        this.globalBottomToolWidth = globalBottomToolWidth;
+    }
+
+    /**
+     * @param globalLeftToolCollapsed flag is for collapsing the global left tool.
      */
     @FromAnyThread
-    public int getGlobalToolWidth() {
-        return globalToolWidth;
+    public void setGlobalLeftToolCollapsed(final boolean globalLeftToolCollapsed) {
+        this.globalLeftToolCollapsed = globalLeftToolCollapsed;
     }
 
     /**
-     * @param globalToolWidth the global tool width.
+     * @param globalBottomToolCollapsed flag is for collapsing the global bottom tool.
      */
     @FromAnyThread
-    public void setGlobalToolWidth(final int globalToolWidth) {
-        this.globalToolWidth = globalToolWidth;
+    public void setGlobalBottomToolCollapsed(final boolean globalBottomToolCollapsed) {
+        this.globalBottomToolCollapsed = globalBottomToolCollapsed;
     }
 
     /**
-     * @param globalToolCollapsed flag is for collapsing the global tool.
+     * @return true if the global left tool is collapsed.
      */
     @FromAnyThread
-    public void setGlobalToolCollapsed(final boolean globalToolCollapsed) {
-        this.globalToolCollapsed = globalToolCollapsed;
+    public boolean isGlobalLeftToolCollapsed() {
+        return globalLeftToolCollapsed;
     }
 
     /**
-     * @return true if the global tool is collapsed.
+     * @return true if the global bottom tool is collapsed.
      */
     @FromAnyThread
-    public boolean isGlobalToolCollapsed() {
-        return globalToolCollapsed;
+    public boolean isGlobalBottomToolCollapsed() {
+        return globalBottomToolCollapsed;
     }
 
     /**
@@ -631,8 +675,10 @@ private void init() {
         this.maximized = prefs.getBoolean(PREF_SCREEN_MAXIMIZED, false);
         this.screenHeight = prefs.getInt(PREF_SCREEN_HEIGHT, 800);
         this.screenWidth = prefs.getInt(PREF_SCREEN_WIDTH, 1200);
-        this.globalToolWidth = prefs.getInt(PREF_GLOBAL_TOOL_WIDTH, 300);
-        this.globalToolCollapsed = prefs.getBoolean(PREF_GLOBAL_TOOL_COLLAPSED, false);
+        this.globalLeftToolWidth = prefs.getInt(PREF_GLOBAL_LEFT_TOOL_WIDTH, 300);
+        this.globalLeftToolCollapsed = prefs.getBoolean(PREF_GLOBAL_LEFT_TOOL_COLLAPSED, false);
+        this.globalBottomToolWidth = prefs.getInt(PREF_GLOBAL_BOTTOM_TOOL_WIDTH, 300);
+        this.globalBottomToolCollapsed = prefs.getBoolean(PREF_GLOBAL_BOTTOM_TOOL_COLLAPSED, true);
         this.decorated = prefs.getBoolean(PREF_SCREEN_DECORATED, true);
         this.analytics = prefs.getBoolean(PREF_ANALYTICS, true);
         this.frameRate = prefs.getInt(PREF_GRAPHIC_FRAME_RATE, 40);
@@ -702,8 +748,10 @@ public synchronized void save() {
         prefs.putInt(PREF_SCREEN_HEIGHT, getScreenHeight());
         prefs.putInt(PREF_SCREEN_WIDTH, getScreenWidth());
         prefs.putBoolean(PREF_SCREEN_MAXIMIZED, isMaximized());
-        prefs.putInt(PREF_GLOBAL_TOOL_WIDTH, getGlobalToolWidth());
-        prefs.putBoolean(PREF_GLOBAL_TOOL_COLLAPSED, isGlobalToolCollapsed());
+        prefs.putInt(PREF_GLOBAL_LEFT_TOOL_WIDTH, getGlobalLeftToolWidth());
+        prefs.putBoolean(PREF_GLOBAL_LEFT_TOOL_COLLAPSED, isGlobalLeftToolCollapsed());
+        prefs.putInt(PREF_GLOBAL_BOTTOM_TOOL_WIDTH, getGlobalBottomToolWidth());
+        prefs.putBoolean(PREF_GLOBAL_BOTTOM_TOOL_COLLAPSED, isGlobalBottomToolCollapsed());
         prefs.putBoolean(PREF_SCREEN_DECORATED, isDecorated());
         prefs.putBoolean(PREF_ANALYTICS, isAnalytics());
         prefs.putInt(PREF_GRAPHIC_FRAME_RATE, getFrameRate());

resources/ui/css/custom_ids.css

@@ -2,27 +2,27 @@
 
 import static javafx.geometry.Pos.TOP_CENTER;
 import static javafx.scene.paint.Color.TRANSPARENT;
-
 import com.ss.editor.Messages;
 import com.ss.editor.annotation.FXThread;
 import com.ss.editor.ui.component.asset.AssetComponent;
 import com.ss.editor.ui.component.bar.EditorBarComponent;
 import com.ss.editor.ui.component.editor.area.EditorAreaComponent;
 import com.ss.editor.ui.component.log.LogView;
-import com.ss.editor.ui.component.split.pane.GlobalToolSplitPane;
-import com.ss.editor.ui.component.tab.GlobalToolComponent;
+import com.ss.editor.ui.component.split.pane.GlobalBottomToolSplitPane;
+import com.ss.editor.ui.component.split.pane.GlobalLeftToolSplitPane;
+import com.ss.editor.ui.component.tab.GlobalBottomToolComponent;
+import com.ss.editor.ui.component.tab.GlobalLeftToolComponent;
 import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.ui.event.EventRedirector;
 import com.ss.editor.ui.scene.EditorFXScene;
-
-import org.jetbrains.annotations.NotNull;
-
+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.StackPane;
 import javafx.stage.Stage;
+import org.jetbrains.annotations.NotNull;
 import rlib.ui.util.FXUtils;
 
 /**
@@ -32,8 +32,6 @@
  */
 public class EditorFXSceneBuilder {
 
-    public static final Insets BAR_OFFSET = new Insets(34, 0, 0, 0);
-
     /**
      * The path to the base CSS styles.
      */
@@ -92,25 +90,40 @@ private static void build(@NotNull final EditorFXScene scene, @NotNull final Sta
 
         new EventRedirector(editorAreaComponent, canvas, stage);
 
-        final GlobalToolSplitPane splitContainer = new GlobalToolSplitPane(scene);
-        splitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
+        final GlobalLeftToolSplitPane leftSplitContainer = new GlobalLeftToolSplitPane(scene);
+        leftSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
 
-        final GlobalToolComponent globalToolComponent = new GlobalToolComponent(splitContainer);
-        globalToolComponent.addComponent(new AssetComponent(), Messages.EDITOR_TOOL_ASSET);
-        globalToolComponent.addComponent(LogView.getInstance(), Messages.LOG_VIEW_TITLE);
+        final GlobalBottomToolSplitPane bottomSplitContainer = new GlobalBottomToolSplitPane(scene);
+        bottomSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
 
-        splitContainer.initFor(globalToolComponent, editorAreaComponent);
+        final GlobalLeftToolComponent globalLeftToolComponent = new GlobalLeftToolComponent(leftSplitContainer);
+        globalLeftToolComponent.addComponent(new AssetComponent(), Messages.EDITOR_TOOL_ASSET);
 
-        FXUtils.addToPane(splitContainer, container);
+        final GlobalBottomToolComponent globalBottomToolComponent = new GlobalBottomToolComponent(bottomSplitContainer);
+        globalBottomToolComponent.addComponent(LogView.getInstance(), Messages.LOG_VIEW_TITLE);
+
+        leftSplitContainer.initFor(globalLeftToolComponent, bottomSplitContainer);
+        bottomSplitContainer.initFor(globalBottomToolComponent, editorAreaComponent);
+
+        FXUtils.addToPane(leftSplitContainer, container);
         FXUtils.addToPane(barComponent, container);
 
         barComponent.createDrawer(container, stage);
         barComponent.toFront();
 
-        FXUtils.bindFixedHeight(splitContainer, container.heightProperty().subtract(BAR_OFFSET.getTop()).add(2));
-        FXUtils.bindFixedWidth(splitContainer, container.widthProperty());
+        FXUtils.bindFixedWidth(leftSplitContainer, container.widthProperty());
         FXUtils.bindFixedWidth(barComponent, container.widthProperty());
 
-        StackPane.setMargin(splitContainer, BAR_OFFSET);
+        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);
     }
 }

src/com/ss/editor/config/EditorConfig.java

@@ -1,18 +1,15 @@
 package com.ss.editor.ui.component.bar;
 
 import static javafx.util.Duration.millis;
-
 import com.ss.editor.JFXApplication;
 import com.ss.editor.config.Config;
 import com.ss.editor.ui.Icons;
-import com.ss.editor.ui.builder.EditorFXSceneBuilder;
 import com.ss.editor.ui.component.ScreenComponent;
 import com.ss.editor.ui.component.bar.action.CloseEditorAction;
 import com.ss.editor.ui.component.bar.action.OpenAssetAction;
 import com.ss.editor.ui.component.bar.action.OpenSettingsAction;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
-
 import javafx.animation.FadeTransition;
 import javafx.animation.TranslateTransition;
 import javafx.event.ActionEvent;
@@ -173,7 +170,8 @@ public void createDrawer(final StackPane container, final Stage stage) {
 
         updateFullscreenButton(stage.isMaximized());
 
-        StackPane.setMargin(drawerContainer, EditorFXSceneBuilder.BAR_OFFSET);
+        heightProperty().addListener((observable, oldValue, newValue) ->
+                StackPane.setMargin(drawerContainer, new Insets(newValue.doubleValue(), 0, 0, 0)));
     }
 
     /**

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

@@ -1,18 +1,17 @@
 package com.ss.editor.ui.component.split.pane;
 
 import com.ss.editor.ui.component.editor.state.EditorToolConfig;
-import com.ss.editor.ui.component.tab.GlobalToolComponent;
+import com.ss.editor.ui.component.tab.GlobalLeftToolComponent;
 import com.ss.editor.ui.component.tab.TabToolComponent;
-
-import org.jetbrains.annotations.NotNull;
-
+import javafx.application.Platform;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.SplitPane;
 import javafx.scene.layout.Region;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * The implementation of the {@link SplitPane} for the {@link GlobalToolComponent}.
+ * The implementation of the {@link SplitPane} for the {@link GlobalLeftToolComponent}.
  *
  * @author JavaSaBr
  */
@@ -21,6 +20,7 @@ public class EditorToolSplitPane extends TabToolSplitPane<EditorToolConfig> {
     /**
      * The root of the editor.
      */
+    @NotNull
     private final Region root;
 
     public EditorToolSplitPane(@NotNull final Scene scene, @NotNull final Region root) {
@@ -34,6 +34,12 @@ public void initFor(@NotNull final TabToolComponent toolComponent, @NotNull fina
         root.widthProperty().addListener((observableValue, oldValue, newValue) -> handleSceneChanged(getSceneWidth()));
     }
 
+    @Override
+    protected void handleSceneChanged(@NotNull final Number newWidth) {
+        super.handleSceneChanged(newWidth);
+        Platform.runLater(this::requestLayout);
+    }
+
     @Override
     protected void bindToScene() {
     }
@@ -45,22 +51,22 @@ protected void addElements(final @NotNull TabToolComponent toolComponent, final
 
     @Override
     protected boolean loadCollapsed() {
-        return config.isToolCollapsed();
+        return getConfig().isToolCollapsed();
     }
 
     @Override
     protected int loadWidth() {
-        return config.getToolWidth();
+        return getConfig().getToolWidth();
     }
 
     @Override
     protected void saveCollapsed(final boolean collapsed) {
-        config.setToolCollapsed(collapsed);
+        getConfig().setToolCollapsed(collapsed);
     }
 
     @Override
     protected void saveWidth(final int width) {
-        config.setToolWidth(width);
+        getConfig().setToolWidth(width);
     }
 
     @Override