fixed some problems with hotkeys.

Author: JavaSaBr

src/com/ss/editor/ui/control/property/impl/AbstractFloatPropertyControl.java

@@ -5,13 +5,13 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiConsumer;
 
-import javafx.event.Event;
 import javafx.scene.layout.HBox;
 import rlib.function.SixObjectConsumer;
 import rlib.ui.control.input.FloatTextField;
@@ -42,7 +42,7 @@ protected void createComponents(@NotNull final HBox container) {
 
         valueField = new FloatTextField();
         valueField.setId(CSSIds.ABSTRACT_PARAM_CONTROL_COMBO_BOX);
-        valueField.setOnKeyPressed(Event::consume);
+        valueField.setOnKeyPressed(UIUtils::consumeIfIsNotHotKey);
         valueField.addChangeListener((observable, oldValue, newValue) -> updateValue());
         valueField.prefWidthProperty().bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
 

src/com/ss/editor/ui/control/property/impl/AbstractIntArrayPropertyControl.java

@@ -4,6 +4,7 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,7 +85,8 @@ protected void reload() {
      * Update the value.
      */
     private void updateValue(final KeyEvent event) {
-        if (event != null) event.consume();
+        UIUtils.consumeIfIsNotHotKey(event);
+
         if (isIgnoreListener() || (event != null && event.getCode() != KeyCode.ENTER)) return;
 
         final String textValue = valueField.getText();

src/com/ss/editor/ui/control/property/impl/AbstractIntegerPropertyControl.java

@@ -4,13 +4,13 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiConsumer;
 
-import javafx.event.Event;
 import javafx.scene.layout.HBox;
 import rlib.function.SixObjectConsumer;
 import rlib.ui.control.input.IntegerTextField;
@@ -41,7 +41,7 @@ protected void createComponents(@NotNull final HBox container) {
 
         valueField = new IntegerTextField();
         valueField.setId(CSSIds.ABSTRACT_PARAM_CONTROL_COMBO_BOX);
-        valueField.setOnKeyPressed(Event::consume);
+        valueField.setOnKeyPressed(UIUtils::consumeIfIsNotHotKey);
         valueField.addChangeListener((observable, oldValue, newValue) -> updateValue());
         valueField.prefWidthProperty().bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
 

src/com/ss/editor/ui/control/property/impl/AbstractQuaternionPropertyControl.java

@@ -9,6 +9,7 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -148,7 +149,8 @@ protected void reload() {
      * Updating rotation.
      */
     private void updateRotation(@Nullable final KeyEvent event) {
-        if (event != null) event.consume();
+        UIUtils.consumeIfIsNotHotKey(event);
+
         if (isIgnoreListener() || (event != null && event.getCode() != KeyCode.ENTER)) return;
 
         final Quaternion oldValue = getPropertyValue();

src/com/ss/editor/ui/control/property/impl/AbstractVector2fPropertyControl.java

@@ -7,6 +7,7 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -130,7 +131,8 @@ protected void reload() {
      * Update the vector.
      */
     protected void updateVector(@Nullable final KeyEvent event) {
-        if (event != null) event.consume();
+        UIUtils.consumeIfIsNotHotKey(event);
+
         if (isIgnoreListener() || (event != null && event.getCode() != KeyCode.ENTER)) return;
 
         final FloatTextField xField = getXField();

src/com/ss/editor/ui/control/property/impl/AbstractVector3fPropertyControl.java

@@ -7,6 +7,7 @@
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
 import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -149,7 +150,8 @@ protected void reload() {
      * Update the vector.
      */
     protected void updateVector(@Nullable final KeyEvent event) {
-        if (event != null) event.consume();
+        UIUtils.consumeIfIsNotHotKey(event);
+
         if (isIgnoreListener() || (event != null && event.getCode() != KeyCode.ENTER)) return;
 
         final FloatTextField xField = getXField();

src/com/ss/editor/ui/util/UIUtils.java

@@ -25,6 +25,7 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
@@ -331,12 +332,25 @@ public static <T> void getAllItems(final Array<TreeItem<T>> container, final Tre
     }
 
     /**
-     * Конвертирование Color в ColorRGBA.
+     * Convert a color from {@link Color} to {@link ColorRGBA}.
      */
-    public static ColorRGBA convertColor(final Color newValue) {
+    @NotNull
+    public static ColorRGBA convertColor(@NotNull final Color newValue) {
         return new ColorRGBA((float) newValue.getRed(), (float) newValue.getGreen(), (float) newValue.getBlue(), (float) newValue.getOpacity());
     }
 
+    /**
+     * Consume an event if the event is not hotkey.
+     *
+     * @param event the event.
+     */
+    public static void consumeIfIsNotHotKey(@Nullable final KeyEvent event) {
+        if (event == null || event.isControlDown() || event.isShiftDown()) {
+            return;
+        }
+        event.consume();
+    }
+
     private UIUtils() {
         throw new RuntimeException();
     }