Merge pull request #8072 from quangson91/5476_toggle_show_hide

#5476: Toggle visibility of object using shortcut
defold · Oct 3, 2023 · 0c7c089 · 0c7c089
2 parents 61e030b + 3cf56a9
commit 0c7c089
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/editor/src/clj/editor/keymap.clj b/editor/src/clj/editor/keymap.clj
@@ -81,7 +81,7 @@
            ["Meta+D" :select-next-occurrence]
            ["Meta+Delete" :delete-to-end-of-line]
            ["Meta+Down" :end-of-file]
-           ["Meta+E" :hide-selected]
+           ["Meta+E" :hide-toggle-selected]
            ["Meta+F" :filter-form]
            ["Meta+F" :find-text]
            ["Meta+G" :find-next]
@@ -169,7 +169,7 @@
            ["Ctrl+Comma" :preferences]
            ["Ctrl+D" :select-next-occurrence]
            ["Ctrl+Delete" :delete-next-word]
-           ["Ctrl+E" :hide-selected]
+           ["Ctrl+E" :hide-toggle-selected]
            ["Ctrl+End" :end-of-file]
            ["Ctrl+F" :filter-form]
            ["Ctrl+F" :find-text]
@@ -277,7 +277,7 @@
            ["Ctrl+Comma" :preferences]
            ["Ctrl+D" :select-next-occurrence]
            ["Ctrl+Delete" :delete-next-word]
-           ["Ctrl+E" :hide-selected]
+           ["Ctrl+E" :hide-toggle-selected]
            ["Ctrl+End" :end-of-file]
            ["Ctrl+F" :filter-form]
            ["Ctrl+F" :find-text]

diff --git a/editor/src/clj/editor/outline_view.clj b/editor/src/clj/editor/outline_view.clj
@@ -267,12 +267,10 @@
    {:label "Move Down"
     :command :move-down}
    {:label :separator}
-   {:label "Hide Objects"
-    :command :hide-selected}
+   {:label "Show/Hide Objects"
+    :command :hide-toggle-selected}
    {:label "Hide Unselected Objects"
     :command :hide-unselected}
-   {:label "Show Objects"
-    :command :show-selected}
    {:label "Show Last Hidden Objects"
     :command :show-last-hidden}
    {:label "Show All Hidden Objects"

diff --git a/editor/src/clj/editor/scene.clj b/editor/src/clj/editor/scene.clj
@@ -1087,12 +1087,10 @@
    {:label "Toggle Grid"
     :command :toggle-grid}
    {:label :separator}
-   {:label "Hide Selected Objects"
-    :command :hide-selected}
+   {:label "Show/Hide Selected Objects"
+    :command :hide-toggle-selected}
    {:label "Hide Unselected Objects"
     :command :hide-unselected}
-   {:label "Show Selected Objects"
-    :command :show-selected}
    {:label "Show Last Hidden Objects"
     :command :show-last-hidden}
    {:label "Show All Hidden Objects"

diff --git a/editor/src/clj/editor/scene_visibility.clj b/editor/src/clj/editor/scene_visibility.clj
@@ -240,19 +240,15 @@
             (g/node-value scene-visibility :unselected-hideable-outline-name-paths evaluation-context))
   (run [scene-visibility] (hide-outline-name-paths! scene-visibility (g/node-value scene-visibility :unselected-hideable-outline-name-paths))))
 
-(handler/defhandler :hide-selected :workbench
-  (active? [scene-visibility evaluation-context]
-           (g/node-value scene-visibility :active-scene-resource-node evaluation-context))
-  (enabled? [scene-visibility evaluation-context]
-            (g/node-value scene-visibility :selected-hideable-outline-name-paths evaluation-context))
-  (run [scene-visibility] (hide-outline-name-paths! scene-visibility (g/node-value scene-visibility :selected-hideable-outline-name-paths))))
-
-(handler/defhandler :show-selected :workbench
-  (active? [scene-visibility evaluation-context]
-           (g/node-value scene-visibility :active-scene-resource-node evaluation-context))
-  (enabled? [scene-visibility evaluation-context]
-            (g/node-value scene-visibility :selected-showable-outline-name-paths evaluation-context))
-  (run [scene-visibility] (show-outline-name-paths! scene-visibility (g/node-value scene-visibility :selected-showable-outline-name-paths))))
+(handler/defhandler :hide-toggle-selected :workbench
+  (active? [scene-visibility evaluation-context] true)
+  (enabled? [scene-visibility evaluation-context] true)
+  (run [scene-visibility]
+       (g/with-auto-evaluation-context evaluation-context
+         (let [should-hide (g/node-value scene-visibility :selected-hideable-outline-name-paths evaluation-context)]
+           (if should-hide
+             (hide-outline-name-paths! scene-visibility (g/node-value scene-visibility :selected-hideable-outline-name-paths))
+             (show-outline-name-paths! scene-visibility (g/node-value scene-visibility :selected-showable-outline-name-paths)))))))
 
 (handler/defhandler :show-last-hidden :workbench
   (active? [scene-visibility evaluation-context]