Allow viewport and node panels to use select all and clear hotkeys

Inochi2D · Sep 22, 2024 · f1c3f40 · f1c3f40
1 parent a70f146
commit f1c3f40
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/source/creator/package.d b/source/creator/package.d
@@ -560,6 +560,31 @@ void incSelectAll() {
     }
 }
 
+/**
+    Unselects nodes
+*/
+void incUnselectNodes() {
+    if (incArmedParameter()) return;
+    incSelectNode();
+}
+
+/**
+    ModelEdit common Hotkeys
+    this hotkeys are used in Viewport Panel and Node Panel
+*/
+void incModelEditorCommonHotKeys() {
+    import creator.core.input;
+    if (incEditMode == EditMode.ModelEdit) {
+        if (!incArmedParameter && (igIsWindowFocused(ImGuiFocusedFlags.ChildWindows) || igIsWindowHovered(ImGuiHoveredFlags.ChildWindows))) {
+            if (incShortcut("Ctrl+A"))
+                incSelectAll();
+
+            if (igIsKeyDown(ImGuiKey.Escape))
+                incUnselectNodes();
+        }
+    }
+}
+
 /**
     Gets whether the node is in the selection
 */

diff --git a/source/creator/panels/nodes.d b/source/creator/panels/nodes.d
@@ -14,7 +14,6 @@ import creator;
 import creator.widgets;
 import creator.ext;
 import creator.core;
-import creator.core.input;
 import creator.utils;
 import inochi2d;
 import std.string;
@@ -476,13 +475,7 @@ protected:
     override
     void onUpdate() {
 
-        if (incEditMode == EditMode.ModelEdit) {
-            if (!incArmedParameter && (igIsWindowFocused(ImGuiFocusedFlags.ChildWindows) || igIsWindowHovered(ImGuiHoveredFlags.ChildWindows))) {
-                if (incShortcut("Ctrl+A")) {
-                    incSelectAll();
-                }
-            }
-        }
+        incModelEditorCommonHotKeys();
 
         if (incEditMode == EditMode.VertexEdit) {
             incLabelOver(_("In vertex edit mode..."), ImVec2(0, 0), true);

diff --git a/source/creator/panels/viewport.d b/source/creator/panels/viewport.d
@@ -58,6 +58,8 @@ protected:
         auto drawList = igGetWindowDrawList();
         auto window = igGetCurrentWindow();
 
+        incModelEditorCommonHotKeys();
+
         // Draw viewport itself
         ImVec2 currSize;
         igGetContentRegionAvail(&currSize);