some changes to improve usability

Author: JavaSaBr

src/main/java/com/ss/editor/Editor.java

@@ -4,6 +4,7 @@
 import static com.ss.rlib.util.ObjectUtils.notNull;
 import static com.ss.rlib.util.Utils.run;
 import static java.nio.file.Files.createDirectories;
+import com.jme3.app.DebugKeysAppState;
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioRenderer;
@@ -327,6 +328,7 @@ public void simpleInitApp() {
         }
 
         createLightProbes();
+        stateManager.detach(stateManager.getState(DebugKeysAppState.class));
 
         new EditorThread(new ThreadGroup("JavaFX"), JFXApplication::start, "JavaFX Launch").start();
     }

src/main/java/com/ss/editor/state/editor/impl/AdvancedAbstractEditor3DState.java

@@ -744,7 +744,6 @@ protected boolean isShiftDown() {
      */
     protected void setShiftDown(final boolean shiftDown) {
         this.shiftDown = shiftDown;
-        new Exception("Shift down" + shiftDown).printStackTrace();
     }
 
     /**

src/main/java/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java

@@ -52,6 +52,8 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
@@ -246,12 +248,8 @@ protected void processChangedFile(@NotNull final FileChangedEvent event) {
         final Path file = event.getFile();
 
         EXECUTOR_MANAGER.addJMETask(() -> {
-
             final Material newMaterial = updateMaterialIdNeed(file, currentMaterial);
-
-            if (newMaterial == null) {
-                EXECUTOR_MANAGER.addFXTask(() -> reload(currentMaterial));
-            } else {
+            if (newMaterial != null) {
                 EXECUTOR_MANAGER.addFXTask(() -> reload(newMaterial));
             }
         });
@@ -487,9 +485,13 @@ private Pane getEditorAreaPane() {
     @Override
     @FXThread
     public boolean isInside(final double sceneX, final double sceneY, @NotNull final Class<? extends Event> eventType) {
-        final Pane editorAreaPane = getEditorAreaPane();
-        final Point2D point2D = editorAreaPane.sceneToLocal(sceneX, sceneY);
-        return editorAreaPane.contains(point2D);
+
+        final Pane page = eventType.isAssignableFrom(MouseEvent.class) ||
+                eventType.isAssignableFrom(ScrollEvent.class) ?
+                getEditorAreaPane() : getPage();
+
+        final Point2D point2D = page.sceneToLocal(sceneX, sceneY);
+        return page.contains(point2D);
     }
 
     /**

src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java

@@ -85,10 +85,7 @@
 import javafx.geometry.Point2D;
 import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
+import javafx.scene.input.*;
 import javafx.scene.layout.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -962,9 +959,12 @@ private Pane getEditorAreaPane() {
     @FXThread
     public boolean isInside(final double sceneX, final double sceneY, @NotNull final Class<? extends Event> eventType) {
 
-        final Pane editorAreaPane = getEditorAreaPane();
-        final Point2D point2D = editorAreaPane.sceneToLocal(sceneX, sceneY);
-        final boolean result = editorAreaPane.contains(point2D);
+        final Pane page = eventType.isAssignableFrom(MouseEvent.class) ||
+                eventType.isAssignableFrom(ScrollEvent.class) ?
+                getEditorAreaPane() : getPage();
+
+        final Point2D point2D = page.sceneToLocal(sceneX, sceneY);
+        final boolean result = page.contains(point2D);
 
         if (LOGGER.isEnabledDebug()) {
             if (Config.DEV_DEBUG_JFX_KEY_INPUT && eventType.isAssignableFrom(KeyEvent.class)) {

src/main/java/com/ss/editor/ui/scene/EditorFXScene.java

@@ -4,6 +4,7 @@
 import static com.ss.rlib.util.ClassUtils.unsafeCast;
 import com.jme3x.jfx.injfx.input.JFXMouseInput;
 import com.ss.editor.annotation.FXThread;
+import com.ss.editor.manager.ExecutorManager;
 import com.ss.editor.manager.PluginManager;
 import com.ss.editor.ui.component.ScreenComponent;
 import com.ss.editor.ui.css.CSSIds;
@@ -32,6 +33,9 @@
  */
 public class EditorFXScene extends Scene {
 
+    @NotNull
+    private static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
+
     /**
      * The list of components.
      */
@@ -74,6 +78,12 @@ public class EditorFXScene extends Scene {
     @Nullable
     private ProgressIndicator progressIndicator;
 
+    /**
+     * Focused node.
+     */
+    @Nullable
+    private Node focused;
+
     /**
      * Instantiates a new Editor fx scene.
      *
@@ -221,6 +231,7 @@ public synchronized void decrementLoading() {
      */
     @FXThread
     private void showLoading() {
+        focused = getFocusOwner();
 
         final VBox loadingLayer = getLoadingLayer();
         loadingLayer.setVisible(true);
@@ -249,6 +260,13 @@ private void hideLoading() {
 
         final StackPane container = getContainer();
         container.setDisable(false);
+
+        if (focused != null) {
+            EXECUTOR_MANAGER.addFXTask(() -> {
+                focused.requestFocus();
+                focused = null;
+            });
+        }
     }
 
     /**

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

@@ -20,6 +20,7 @@
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
+import javafx.event.EventTarget;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -486,16 +487,20 @@ public static Color from(@Nullable final ColorRGBA color) {
      */
     @FXThread
     public static void consumeIfIsNotHotKey(@Nullable final KeyEvent event) {
-        if (event == null) {
-            return;
-        } else if (event.isControlDown()) {
+        if (event == null) return;
 
-            final KeyCode code = event.getCode();
+        final String text = event.getText();
+        if (text.isEmpty()) return;
 
-            if (!(code == KeyCode.Z || code == KeyCode.Y)) {
-                return;
-            }
+        final KeyCode code = event.getCode();
+        final EventTarget target = event.getTarget();
 
+        if (code == KeyCode.TAB && !(target instanceof TextInputControl)) {
+            return;
+        }
+
+        if (event.isControlDown()) {
+            return;
         } else if (event.isShiftDown()) {
             return;
         }