Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Toggle visibility of object using shortcut #8072

Merged
merged 2 commits into from Oct 3, 2023
Merged

Toggle visibility of object using shortcut #8072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b715378
Toggle visibility of object using shortcut
quangson91 Oct 2, 2023
3cf56a9
Rename command show/hide
quangson91 Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions editor/src/clj/editor/keymap.clj
View file
Open in desktop
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
6 changes: 2 additions & 4 deletions editor/src/clj/editor/outline_view.clj
View file
Open in desktop
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions editor/src/clj/editor/scene.clj
View file
Open in desktop
Expand Up @@ -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"
Expand Down
22 changes: 9 additions & 13 deletions editor/src/clj/editor/scene_visibility.clj
View file
Open in desktop
Expand Up @@ -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]
Expand Down