updated styles of dialogs.

JavaSaBr · JavaSaBr · commit 650a57bc5745 · 2017-07-15T11:07:30.000+03:00
diff --git a/resources/ui/css/custom_classes.bss b/resources/ui/css/custom_classes.bss
diff --git a/resources/ui/css/custom_classes.css b/resources/ui/css/custom_classes.css
@@ -55,6 +55,11 @@
     -fx-padding: 15px 15px 15px 15px;
 }
 
+.dialog-actions-root > .hbox {
+    -fx-alignment: center-right;
+    -fx-spacing: 4px;
+}
+
 .dialog-content-root {
     -fx-padding: 10px 15px 0px 15px;
     -fx-alignment: center;
@@ -531,6 +536,22 @@
  *                                                                             *
  ******************************************************************************/
 
+.settings-dialog {
+}
+
+.settings-dialog > .dialog-content-root {
+    -fx-padding: 0px 0px 0px 0px;
+}
+
+.settings-dialog > .dialog-content-root > .tab-pane  {
+    -fx-max-height: 260px;
+}
+
+.settings-dialog > .dialog-content-root > .tab-pane > .tab-content-area > .vbox {
+    -fx-spacing: 2px;
+    -fx-padding: 6px 15px 0px 0px;
+}
+
 .settings-dialog-label {
     -fx-alignment: center-right;
     -fx-min-width: 250px;
@@ -560,6 +581,18 @@
     -fx-min-width: 20px;
 }
 
+.settings-dialog-message-label {
+    -fx-alignment: center;
+    -fx-text-alignment: center;
+    -fx-min-height: 35;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-fill: red;
+    -fx-text-fill: red;
+    -fx-wrap-text: true;
+    -fx-font-size: 15px;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Audio Editor                                                                *
diff --git a/resources/ui/css/custom_ids.bss b/resources/ui/css/custom_ids.bss
diff --git a/resources/ui/css/custom_ids.css b/resources/ui/css/custom_ids.css
@@ -116,22 +116,11 @@
     -fx-min-width: 30px;
 }
 
-#AssetComponentBar {
-    -fx-background-color: transparent;
-    -fx-min-height: 30;
-    -fx-pref-height: -fx-min-height;
-    -fx-max-height: -fx-min-height;
-    -fx-alignment: center-left;
-}
-
-#AssetComponentBarButton {
-    -fx-min-height: 30;
-    -fx-pref-height: -fx-min-height;
-    -fx-max-height: -fx-min-height;
-    -fx-min-width: 30;
-    -fx-pref-width: -fx-min-width;
-    -fx-max-width: -fx-min-width;
-}
+/*******************************************************************************
+ *                                                                             *
+ * Asset Editor Dialog                                                         *
+ *                                                                             *
+ ******************************************************************************/
 
 #AssetEditorDialogButtonContainer {
     -fx-alignment: center-right;
@@ -197,24 +186,6 @@
     -fx-max-width: -fx-min-width;
 }
 
-/*******************************************************************************
- *                                                                             *
- * Settings Dialog                                                             *
- *                                                                             *
- ******************************************************************************/
-
-#SettingsDialogMessageLabel {
-    -fx-alignment: center;
-    -fx-text-alignment: center;
-    -fx-min-height: 35;
-    -fx-pref-height: -fx-min-height;
-    -fx-max-height: -fx-min-height;
-    -fx-fill: red;
-    -fx-text-fill: red;
-    -fx-wrap-text: true;
-    -fx-font-size: 15px;
-}
-
 #ImageChannelPreview {
     -fx-background-color: -var-background-color;
     -fx-effect: -fx-shadow-panel;
diff --git a/resources/ui/css/external.bss b/resources/ui/css/external.bss
diff --git a/resources/ui/css/external.css b/resources/ui/css/external.css
@@ -1,6 +1,6 @@
 
 .code-area {
-    -fx-background-color: transparent;
+    -fx-background-color: -var-background-color;
     -fx-stroke: -var-font-color;
     -fx-font-family: "Ubuntu Mono";
     -fx-font-size: 13px;
diff --git a/src/com/ss/editor/ui/component/asset/AssetBarComponent.java b/src/com/ss/editor/ui/component/asset/AssetBarComponent.java
@@ -1,15 +1,12 @@
 package com.ss.editor.ui.component.asset;
 
 import com.ss.editor.ui.Icons;
-import com.ss.editor.ui.css.CSSClasses;
-import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.ui.event.FXEventManager;
 import com.ss.editor.ui.event.impl.RequestedRefreshAssetEvent;
-
+import com.ss.rlib.ui.util.FXUtils;
 import javafx.scene.control.Button;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import com.ss.rlib.ui.util.FXUtils;
 
 /**
  * The toolbar of the {@link AssetComponent} with actions.
@@ -24,14 +21,11 @@ public class AssetBarComponent extends HBox {
      * Instantiates a new Asset bar component.
      */
     public AssetBarComponent() {
-        setId(CSSIds.ASSET_COMPONENT_BAR);
 
         final Button refreshAction = new Button();
-        refreshAction.setId(CSSIds.ASSET_COMPONENT_BAR_BUTTON);
         refreshAction.setGraphic(new ImageView(Icons.REFRESH_18));
         refreshAction.setOnAction(event -> FX_EVENT_MANAGER.notify(new RequestedRefreshAssetEvent()));
 
-        FXUtils.addClassTo(refreshAction, CSSClasses.FLAT_BUTTON);
         FXUtils.addToPane(refreshAction, this);
     }
 }
diff --git a/src/com/ss/editor/ui/component/asset/AssetComponent.java b/src/com/ss/editor/ui/component/asset/AssetComponent.java
@@ -10,6 +10,7 @@
 import com.ss.editor.ui.component.asset.tree.resource.FolderElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceElementFactory;
+import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.ui.event.FXEventManager;
 import com.ss.editor.ui.event.impl.*;
@@ -173,9 +174,11 @@ private void createComponents() {
 
         //FIXME пока он не нужен
         //FXUtils.addToPane(barComponent, this);
+        //FXUtils.bindFixedHeight(resourceTree, heightProperty().subtract(barComponent.heightProperty()));
+
         FXUtils.addToPane(resourceTree, this);
         FXUtils.bindFixedHeight(resourceTree, heightProperty());
-        //FXUtils.bindFixedHeight(resourceTree, heightProperty().subtract(barComponent.heightProperty()));
+        FXUtils.addClassTo(resourceTree, CSSClasses.TRANSPARENT_LIST_VIEW);
     }
 
     /**
diff --git a/src/com/ss/editor/ui/component/asset/tree/ResourceTree.java b/src/com/ss/editor/ui/component/asset/tree/ResourceTree.java
@@ -12,11 +12,9 @@
 import com.ss.editor.ui.component.asset.tree.resource.FolderElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceLoadingElement;
-import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.util.UIUtils;
 import com.ss.editor.util.EditorUtil;
 import com.ss.rlib.function.IntObjectConsumer;
-import com.ss.rlib.ui.util.FXUtils;
 import com.ss.rlib.util.StringUtils;
 import com.ss.rlib.util.array.Array;
 import com.ss.rlib.util.array.ArrayComparator;
@@ -179,8 +177,6 @@ public ResourceTree(@Nullable final Consumer<ResourceElement> openFunction, fina
         setShowRoot(true);
         setContextMenu(new ContextMenu());
         setFocusTraversable(true);
-
-        FXUtils.addClassTo(this, CSSClasses.TRANSPARENT_TREE_VIEW);
     }
 
     /**
diff --git a/src/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java b/src/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java
@@ -50,7 +50,7 @@ public abstract class AbstractFileCreator extends AbstractSimpleEditorDialog imp
      * The constant DIALOG_SIZE.
      */
     @NotNull
-    protected static final Point DIALOG_SIZE = new Point(900, 401);
+    protected static final Point DIALOG_SIZE = new Point(900, -1);
 
     /**
      * The constant EXECUTOR_MANAGER.
diff --git a/src/com/ss/editor/ui/component/creator/impl/material/MaterialFileCreator.java b/src/com/ss/editor/ui/component/creator/impl/material/MaterialFileCreator.java
@@ -94,6 +94,8 @@ protected void createSettings(@NotNull final GridPane root) {
 
         final TextField editor = materialTypeComboBox.getEditor();
 
+        FXUtils.addClassTo(editor, CSSClasses.TRANSPARENT_TEXT_FIELD);
+
         AutoCompleteComboBoxListener.install(materialTypeComboBox);
 
         definitions = RESOURCE_MANAGER.getAvailableMaterialDefinitions();
diff --git a/src/com/ss/editor/ui/css/CSSClasses.java b/src/com/ss/editor/ui/css/CSSClasses.java
@@ -364,6 +364,10 @@ public interface CSSClasses {
      */
     String SCENE_FILTER_LIST_CELL = "scene-filter-list-cell";
 
+    /**
+     * The constant SETTINGS_DIALOG.
+     */
+    String SETTINGS_DIALOG = "settings-dialog";
     /**
      * The constant SETTINGS_DIALOG_LABEL.
      */
@@ -376,6 +380,10 @@ public interface CSSClasses {
      * The constant SETTINGS_DIALOG_SHORT_LABEL.
      */
     String SETTINGS_DIALOG_SHORT_LABEL = "settings-dialog-short-label";
+    /**
+     * The constant SETTINGS_DIALOG_MESSAGE_LABEL.
+     */
+    String SETTINGS_DIALOG_MESSAGE_LABEL = "settings-dialog-message-label";
 
     /**
      * The constant AUDIO_VIEW_EDITOR_CONTAINER.
diff --git a/src/com/ss/editor/ui/css/CSSIds.java b/src/com/ss/editor/ui/css/CSSIds.java
@@ -53,21 +53,12 @@ public interface CSSIds {
      * The constant ASSET_COMPONENT.
      */
     String ASSET_COMPONENT = "AssetComponent";
-    /**
-     * The constant ASSET_COMPONENT_BAR.
-     */
-    String ASSET_COMPONENT_BAR = "AssetComponentBar";
-    /**
-     * The constant ASSET_COMPONENT_BAR_BUTTON.
-     */
-    String ASSET_COMPONENT_BAR_BUTTON = "AssetComponentBarButton";
 
     /**
      * The constant JME_PREVIEW_MANAGER_IMAGE_VIEW.
      */
     String JME_PREVIEW_MANAGER_IMAGE_VIEW = "JmePreviewManagerImageView";
 
-
     /**
      * The constant ASSET_EDITOR_DIALOG_BUTTON_CONTAINER.
      */
@@ -98,10 +89,6 @@ public interface CSSIds {
      */
     String PARTICLES_ASSET_EDITOR_DIALOG_CONTROL = "ParticlesAssetEditorDialogControl";
 
-    /**
-     * The constant SETTINGS_DIALOG_MESSAGE_LABEL.
-     */
-    String SETTINGS_DIALOG_MESSAGE_LABEL = "SettingsDialogMessageLabel";
 
     /**
      * The constant IMAGE_CHANNEL_PREVIEW.
diff --git a/src/com/ss/editor/ui/dialog/AbstractSimpleEditorDialog.java b/src/com/ss/editor/ui/dialog/AbstractSimpleEditorDialog.java
@@ -7,7 +7,6 @@
 import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.util.EditorUtil;
 import com.ss.rlib.ui.util.FXUtils;
-import javafx.geometry.Insets;
 import javafx.scene.control.Button;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -59,12 +58,6 @@ public abstract class AbstractSimpleEditorDialog extends EditorDialog {
      */
     protected static final double DEFAULT_FIELD_W_PERCENT4 = 0.3;
 
-    /**
-     * The constant OK_BUTTON_OFFSET.
-     */
-    @NotNull
-    protected static final Insets OK_BUTTON_OFFSET = new Insets(0, 4, 0, 0);
-
     /**
      * The constant EXECUTOR_MANAGER.
      */
@@ -128,7 +121,6 @@ protected void createActions(@NotNull final VBox root) {
         super.createActions(root);
 
         final HBox container = new HBox();
-        container.setId(CSSIds.ASSET_EDITOR_DIALOG_BUTTON_CONTAINER);
 
         okButton = new Button(getButtonOkLabel());
         okButton.setOnAction(event -> safeProcessOk());
@@ -141,8 +133,7 @@ protected void createActions(@NotNull final VBox root) {
         FXUtils.addToPane(container, root);
 
         FXUtils.addClassTo(okButton, cancelButton, CSSClasses.DIALOG_BUTTON);
-
-        HBox.setMargin(okButton, OK_BUTTON_OFFSET);
+        FXUtils.addClassTo(container, CSSClasses.DEF_HBOX);
     }
 
     private void safeProcessOk() {
diff --git a/src/com/ss/editor/ui/dialog/EditorDialog.java b/src/com/ss/editor/ui/dialog/EditorDialog.java
@@ -114,6 +114,9 @@ public EditorDialog() {
         dialog.setScene(scene);
 
         configureSize(container);
+
+        container.heightProperty().addListener((observable, oldValue, newValue) -> dialog.sizeToScene());
+        container.widthProperty().addListener((observable, oldValue, newValue) -> dialog.sizeToScene());
     }
 
     /**
diff --git a/src/com/ss/editor/ui/dialog/SettingsDialog.java b/src/com/ss/editor/ui/dialog/SettingsDialog.java
