fixed a bug with asset dialog, updated property controls API.

JavaSaBr · JavaSaBr · commit aa368e04bd80 · 2017-09-14T09:16:31.000+03:00
diff --git a/src/main/java/com/ss/editor/ui/control/property/PropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/PropertyControl.java
@@ -332,6 +332,22 @@ protected void createComponents() {
         FXUtils.addToPane(container, this);
     }
 
+    /**
+     * Change control width percent.
+     *
+     * @param controlWidthPercent the control width percent.
+     */
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+
+        if (!isSingleRow()) {
+            return;
+        }
+
+        propertyNameLabel.maxWidthProperty().unbind();
+        propertyNameLabel.maxWidthProperty().bind(widthProperty().multiply(1D - controlWidthPercent));
+    }
+
     /**
      * Is single row boolean.
      *
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/BooleanPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/BooleanPropertyControl.java
@@ -10,6 +10,7 @@
 import com.ss.rlib.ui.util.FXUtils;
 import javafx.scene.control.CheckBox;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,6 +55,16 @@ protected void createComponents(@NotNull final HBox container) {
         FXUtils.addClassTo(checkBox, CSSClasses.ABSTRACT_PARAM_CONTROL_CHECK_BOX);
     }
 
+    /**
+     * Disable the offset of checkbox control.
+     */
+    @FXThread
+    public void disableCheckboxOffset() {
+        final CheckBox checkBox = getCheckBox();
+        checkBox.prefWidthProperty().unbind();
+        checkBox.setPrefWidth(Region.USE_COMPUTED_SIZE);
+    }
+
     @Override
     @FromAnyThread
     protected boolean isSingleRow() {
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/ColorPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/ColorPropertyControl.java
@@ -47,6 +47,16 @@ protected void createComponents(@NotNull final HBox container) {
         FXUtils.addClassTo(colorPicker, CSSClasses.ABSTRACT_PARAM_CONTROL_COLOR_PICKER);
     }
 
+    @Override
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+        super.changeControlWidthPercent(controlWidthPercent);
+
+        final ColorPicker colorPicker = getColorPicker();
+        colorPicker.prefWidthProperty().unbind();
+        colorPicker.prefWidthProperty().bind(widthProperty().multiply(controlWidthPercent));
+    }
+
     @Override
     @FXThread
     protected void setPropertyValue(@Nullable final ColorRGBA color) {
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/FloatPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/FloatPropertyControl.java
@@ -41,6 +41,16 @@ public FloatPropertyControl(@Nullable final Float propertyValue, @NotNull final
         super(propertyValue, propertyName, changeConsumer, changeHandler);
     }
 
+    @Override
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+        super.changeControlWidthPercent(controlWidthPercent);
+
+        final FloatTextField valueField = getValueField();
+        valueField.prefWidthProperty().unbind();
+        valueField.prefWidthProperty().bind(widthProperty().multiply(controlWidthPercent));
+    }
+
     @Override
     @FXThread
     protected void createComponents(@NotNull final HBox container) {
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/IntegerPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/IntegerPropertyControl.java
@@ -32,6 +32,16 @@ public IntegerPropertyControl(@Nullable final Integer propertyValue, @NotNull fi
         super(propertyValue, propertyName, changeConsumer);
     }
 
+    @Override
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+        super.changeControlWidthPercent(controlWidthPercent);
+
+        final IntegerTextField valueField = getValueField();
+        valueField.prefWidthProperty().unbind();
+        valueField.prefWidthProperty().bind(widthProperty().multiply(controlWidthPercent));
+    }
+
     @Override
     @FXThread
     protected void createComponents(@NotNull final HBox container) {
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/Texture2DPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/Texture2DPropertyControl.java
@@ -97,6 +97,11 @@ public Texture2DPropertyControl(@Nullable final Texture2D propertyValue, @NotNul
         setOnDragDropped(this::handleDragDroppedEvent);
     }
 
+    @Override
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+    }
+
     /**
      * Handle drag dropped events.
      *
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/Vector2FPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/Vector2FPropertyControl.java
@@ -37,42 +37,66 @@ public class Vector2FPropertyControl<C extends ChangeConsumer, T> extends Proper
     @Nullable
     private FloatTextField yField;
 
+    /**
+     * The field container.
+     */
+    @Nullable
+    private HBox fieldContainer;
+
     public Vector2FPropertyControl(@Nullable final Vector2f propertyValue, @NotNull final String propertyName,
                                    @NotNull final C changeConsumer) {
         super(propertyValue, propertyName, changeConsumer);
     }
 
+    @Override
+    @FXThread
+    public void changeControlWidthPercent(final double controlWidthPercent) {
+        super.changeControlWidthPercent(controlWidthPercent);
+
+        final HBox valueField = getFieldContainer();
+        valueField.prefWidthProperty().unbind();
+        valueField.prefWidthProperty().bind(widthProperty().multiply(controlWidthPercent));
+    }
+
     @Override
     @FXThread
     protected void createComponents(@NotNull final HBox container) {
         super.createComponents(container);
 
-        final HBox field = new HBox();
-        field.prefWidthProperty()
+        fieldContainer = new HBox();
+        fieldContainer.prefWidthProperty()
                 .bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
 
         xField = new FloatTextField();
         xField.setOnKeyReleased(this::updateVector);
         xField.addChangeListener((observable, oldValue, newValue) -> updateVector(null));
-        xField.prefWidthProperty().bind(field.widthProperty().multiply(0.5));
+        xField.prefWidthProperty().bind(fieldContainer.widthProperty().multiply(0.5));
         xField.setScrollPower(10F);
 
         yField = new FloatTextField();
         yField.setOnKeyReleased(this::updateVector);
         yField.addChangeListener((observable, oldValue, newValue) -> updateVector(null));
-        yField.prefWidthProperty().bind(field.widthProperty().multiply(0.5));
+        yField.prefWidthProperty().bind(fieldContainer.widthProperty().multiply(0.5));
         yField.setScrollPower(10F);
 
-        FXUtils.addToPane(xField, field);
-        FXUtils.addToPane(yField, field);
-        FXUtils.addToPane(field, container);
+        FXUtils.addToPane(xField, fieldContainer);
+        FXUtils.addToPane(yField, fieldContainer);
+        FXUtils.addToPane(fieldContainer, container);
 
-        FXUtils.addClassesTo(field, CSSClasses.DEF_HBOX, CSSClasses.TEXT_INPUT_CONTAINER,
+        FXUtils.addClassesTo(fieldContainer, CSSClasses.DEF_HBOX, CSSClasses.TEXT_INPUT_CONTAINER,
                 CSSClasses.ABSTRACT_PARAM_CONTROL_SHORT_INPUT_CONTAINER);
 
         FXUtils.addClassesTo(xField, yField, CSSClasses.TRANSPARENT_TEXT_FIELD);
 
-        UIUtils.addFocusBinding(field, xField, yField);
+        UIUtils.addFocusBinding(fieldContainer, xField, yField);
+    }
+
+    /**
+     * @return the field container.
+     */
+    @FXThread
+    private @NotNull HBox getFieldContainer() {
+        return notNull(fieldContainer);
     }
 
     @Override
@@ -143,7 +167,7 @@ protected void reload() {
 
         final FloatTextField yField = getYField();
         yField.setValue(vector.getY());
-        yField.positionCaret(xField.getText().length());
+        yField.positionCaret(yField.getText().length());
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/Vector3FSingleRowPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/Vector3FSingleRowPropertyControl.java
diff --git a/src/main/java/com/ss/editor/ui/dialog/asset/file/AssetEditorDialog.java b/src/main/java/com/ss/editor/ui/dialog/asset/file/AssetEditorDialog.java
diff --git a/src/main/java/com/ss/editor/ui/util/UIUtils.java b/src/main/java/com/ss/editor/ui/util/UIUtils.java

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,11 @@ public Texture2DPropertyControl(@Nullable final Texture2D propertyValue, @NotNul`
`97`	`97`	`setOnDragDropped(this::handleDragDroppedEvent);`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ @Override`
	`101`	`+ @FXThread`
	`102`	`+ public void changeControlWidthPercent(final double controlWidthPercent) {`
	`103`	`+ }`
	`104`	`+`
`100`	`105`	`/**`
`101`	`106`	`* Handle drag dropped events.`
`102`	`107`	`*`