реализация скролирование колесиком мышки значений координат и цифровых значений материалов

JavaSaBr · JavaSaBr · commit 999d8c4e0f3d · 2016-03-06T20:01:09.000+03:00
diff --git a/build-native.xml b/build-native.xml
@@ -117,7 +117,7 @@
                         name="jME3-SpaceShift-Editor"
                         mainClass="com.ss.editor.Starter"
                         toolkit="fx"
-                        version="0.3"
+                        version="0.3.5"
                 />
 
         <mkdir dir="build/classes/META-INF"/>
@@ -130,7 +130,7 @@
             <manifest>
                 <attribute name="Implementation-Vendor" value="spaceshift.ru"/>
                 <attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
-                <attribute name="Implementation-Version" value="0.3"/>
+                <attribute name="Implementation-Version" value="0.3.5"/>
             </manifest>
         </fx:jar>
 
diff --git a/resources/ui/css/custom_ids.css b/resources/ui/css/custom_ids.css
@@ -340,7 +340,16 @@
     -fx-max-height: -fx-min-height;
 }
 
-#ModelParamControlNumberField {
+#ModelParamControlVector3fField {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 72;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+}
+
+#ModelParamControlVector4fField {
     -fx-min-height: 24;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
diff --git a/src/com/ss/editor/config/config.xml b/src/com/ss/editor/config/config.xml
@@ -2,5 +2,5 @@
 <list>
     <set name="Graphics.enablePBR" value="true"/>
 
-    <set name="Dev.debug" value="true"/>
+    <set name="Dev.debug" value="false"/>
 </list>
diff --git a/src/com/ss/editor/ui/control/material/FloatMaterialParamControl.java b/src/com/ss/editor/ui/control/material/FloatMaterialParamControl.java
@@ -10,6 +10,7 @@
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
 import javafx.scene.control.SpinnerValueFactory.DoubleSpinnerValueFactory;
+import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.HBox;
 import rlib.ui.util.FXUtils;
 
@@ -43,6 +44,7 @@ protected void createComponents() {
         spinner.setId(CSSIds.MATERIAL_PARAM_CONTROL_SPINNER);
         spinner.setValueFactory(valueFactory);
         spinner.setEditable(true);
+        spinner.setOnScroll(this::processScroll);
         spinner.valueProperty().addListener((observable, oldValue, newValue) -> processChange(newValue));
 
         FXUtils.addToPane(spinner, this);
@@ -52,6 +54,24 @@ protected void createComponents() {
         HBox.setMargin(spinner, ELEMENT_OFFSET);
     }
 
+    /**
+     * Процесс скролирования значения.
+     */
+    private void processScroll(final ScrollEvent event) {
+
+        if(!event.isControlDown()) {
+            return;
+        }
+
+        final double deltaY = event.getDeltaY();
+
+        if(deltaY > 0) {
+            spinner.increment(10);
+        } else {
+            spinner.decrement(10);
+        }
+    }
+
     /**
      * Процесс обновления дробных значения.
      */
diff --git a/src/com/ss/editor/ui/control/material/IntegerMaterialParamControl.java b/src/com/ss/editor/ui/control/material/IntegerMaterialParamControl.java
@@ -10,6 +10,7 @@
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
 import javafx.scene.control.SpinnerValueFactory.IntegerSpinnerValueFactory;
+import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.HBox;
 import rlib.ui.util.FXUtils;
 
@@ -43,6 +44,7 @@ protected void createComponents() {
         spinner.setId(CSSIds.MATERIAL_PARAM_CONTROL_SPINNER);
         spinner.setValueFactory(valueFactory);
         spinner.setEditable(true);
+        spinner.setOnScroll(this::processScroll);
         spinner.valueProperty().addListener((observable, oldValue, newValue) -> processChange(newValue));
 
         FXUtils.addToPane(spinner, this);
@@ -52,6 +54,24 @@ protected void createComponents() {
         HBox.setMargin(spinner, ELEMENT_OFFSET);
     }
 
+    /**
+     * Процесс скролирования значения.
+     */
+    private void processScroll(final ScrollEvent event) {
+
+        if(!event.isControlDown()) {
+            return;
+        }
+
+        final double deltaY = event.getDeltaY();
+
+        if(deltaY > 0) {
+            spinner.increment();
+        } else {
+            spinner.decrement();
+        }
+    }
+
     /**
      * Процесс обновления целочисленного значения.
      */
diff --git a/src/com/ss/editor/ui/control/model/property/QuaternionModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/QuaternionModelPropertyControl.java
@@ -5,6 +5,7 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.HBox;
 import rlib.ui.util.FXUtils;
 
@@ -47,28 +48,32 @@ protected void createComponents(final HBox container) {
         xLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         xField = new TextField();
-        xField.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        xField.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR4F_FIELD);
+        xField.setOnScroll(this::processScroll);
         xField.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         final Label yLabel = new Label("y:");
         yLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         yFiled = new TextField();
-        yFiled.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        yFiled.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR4F_FIELD);
+        yFiled.setOnScroll(this::processScroll);
         yFiled.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         final Label zLabel = new Label("z:");
         zLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         zField = new TextField();
-        zField.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        zField.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR4F_FIELD);
+        zField.setOnScroll(this::processScroll);
         zField.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         final Label wLabel = new Label("w:");
         wLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         wField = new TextField();
-        wField.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        wField.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR4F_FIELD);
+        wField.setOnScroll(this::processScroll);
         wField.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         FXUtils.addToPane(xLabel, container);
@@ -81,6 +86,32 @@ protected void createComponents(final HBox container) {
         FXUtils.addToPane(wField, container);
     }
 
+    /**
+     * Процесс скролирования значения.
+     */
+    private void processScroll(final ScrollEvent event) {
+
+        if(!event.isControlDown()) {
+            return;
+        }
+
+        final TextField source = (TextField) event.getSource();
+        final String text = source.getText();
+
+        float value = 0;
+
+        try {
+            value = Float.parseFloat(text);
+        } catch (final NumberFormatException e) {
+            return;
+        }
+
+        long longValue = (long) (value * 1000);
+        longValue += event.getDeltaY();
+
+        source.setText(String.valueOf(longValue / 1000F));
+    }
+
     /**
      * @return поле X.
      */
diff --git a/src/com/ss/editor/ui/control/model/property/Vector3fModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/Vector3fModelPropertyControl.java
@@ -5,6 +5,7 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.HBox;
 import rlib.ui.util.FXUtils;
 
@@ -42,21 +43,24 @@ protected void createComponents(final HBox container) {
         xLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         xField = new TextField();
-        xField.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        xField.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR3F_FIELD);
+        xField.setOnScroll(this::processScroll);
         xField.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         final Label yLabel = new Label("y:");
         yLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         yFiled = new TextField();
-        yFiled.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        yFiled.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR3F_FIELD);
+        yFiled.setOnScroll(this::processScroll);
         yFiled.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         final Label zLabel = new Label("z:");
         zLabel.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_LABEL);
 
         zField = new TextField();
-        zField.setId(CSSIds.MODEL_PARAM_CONTROL_NUMBER_FIELD);
+        zField.setId(CSSIds.MODEL_PARAM_CONTROL_VECTOR3F_FIELD);
+        zField.setOnScroll(this::processScroll);
         zField.textProperty().addListener((observable, oldValue, newValue) -> updateVector());
 
         FXUtils.addToPane(xLabel, container);
@@ -67,6 +71,32 @@ protected void createComponents(final HBox container) {
         FXUtils.addToPane(zField, container);
     }
 
+    /**
+     * Процесс скролирования значения.
+     */
+    private void processScroll(final ScrollEvent event) {
+
+        if(!event.isControlDown()) {
+            return;
+        }
+
+        final TextField source = (TextField) event.getSource();
+        final String text = source.getText();
+
+        float value = 0;
+
+        try {
+            value = Float.parseFloat(text);
+        } catch (final NumberFormatException e) {
+            return;
+        }
+
+        long longValue = (long) (value * 1000);
+        longValue += (event.getDeltaY() * 10);
+
+        source.setText(String.valueOf(longValue / 1000F));
+    }
+
     /**
      * @return поле X.
      */
diff --git a/src/com/ss/editor/ui/css/CSSIds.java b/src/com/ss/editor/ui/css/CSSIds.java
@@ -65,7 +65,8 @@ public interface CSSIds {
     public static final String MODEL_PARAM_CONTROL_PARAM_NAME = "ModelParamControlParamName";
     public static final String MODEL_PARAM_CONTROL_PARAM_NAME_SINGLE_ROW = "ModelParamControlParamNameSingleRow";
     public static final String MODEL_PARAM_CONTROL_NUMBER_LABEL = "ModelParamControlNumberLabel";
-    public static final String MODEL_PARAM_CONTROL_NUMBER_FIELD = "ModelParamControlNumberField";
+    public static final String MODEL_PARAM_CONTROL_VECTOR3F_FIELD = "ModelParamControlVector3fField";
+    public static final String MODEL_PARAM_CONTROL_VECTOR4F_FIELD = "ModelParamControlVector4fField";
     public static final String MODEL_PARAM_CONTROL_COMBO_BOX = "ModelParamControlComboBox";
 
     public static final String MODEL_PARAM_CONTROL_MATERIAL_LABEL = "ModelParamControlMaterialLabel";
