Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
3b8bd50b
Unverified
Commit
3b8bd50b
authored
May 15, 2018
by
Rémi Verschelde
Committed by
GitHub
May 15, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18894 from volzhs/fix-toggle-visibility
Respect visibility change by Scene dock when using Sync Scene Changes
parents
0738ba6b
bcb24a0b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
29 deletions
+15
-29
scene_tree_editor.cpp
editor/scene_tree_editor.cpp
+15
-27
scene_tree_editor.h
editor/scene_tree_editor.h
+0
-2
No files found.
editor/scene_tree_editor.cpp
View file @
3b8bd50b
...
...
@@ -70,8 +70,18 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
}
else
if
(
p_id
==
BUTTON_VISIBILITY
)
{
undo_redo
->
create_action
(
TTR
(
"Toggle Visible"
));
undo_redo
->
add_do_method
(
this
,
"toggle_visible"
,
n
);
undo_redo
->
add_undo_method
(
this
,
"toggle_visible"
,
n
);
_toggle_visible
(
n
);
List
<
Node
*>
selection
=
editor_selection
->
get_selected_node_list
();
if
(
selection
.
size
()
>
1
)
{
for
(
List
<
Node
*>::
Element
*
E
=
selection
.
front
();
E
;
E
=
E
->
next
())
{
Node
*
nv
=
E
->
get
();
ERR_FAIL_COND
(
!
nv
);
if
(
nv
==
n
)
{
continue
;
}
_toggle_visible
(
nv
);
}
}
undo_redo
->
commit_action
();
}
else
if
(
p_id
==
BUTTON_LOCK
)
{
...
...
@@ -118,33 +128,13 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
}
}
void
SceneTreeEditor
::
_toggle_visible
(
Node
*
p_node
)
{
if
(
p_node
->
is_class
(
"Spatial"
))
{
bool
v
=
bool
(
p_node
->
call
(
"is_visible"
));
p_node
->
call
(
"set_visible"
,
!
v
);
}
else
if
(
p_node
->
is_class
(
"CanvasItem"
))
{
if
(
p_node
->
has_method
(
"is_visible"
)
&&
p_node
->
has_method
(
"set_visible"
))
{
bool
v
=
bool
(
p_node
->
call
(
"is_visible"
));
if
(
v
)
{
p_node
->
call
(
"hide"
);
}
else
{
p_node
->
call
(
"show"
);
}
undo_redo
->
add_do_method
(
p_node
,
"set_visible"
,
!
v
);
undo_redo
->
add_undo_method
(
p_node
,
"set_visible"
,
v
);
}
}
void
SceneTreeEditor
::
toggle_visible
(
Node
*
p_node
)
{
_toggle_visible
(
p_node
);
List
<
Node
*>
selection
=
editor_selection
->
get_selected_node_list
();
if
(
selection
.
size
()
>
1
)
{
for
(
List
<
Node
*>::
Element
*
E
=
selection
.
front
();
E
;
E
=
E
->
next
())
{
Node
*
nv
=
E
->
get
();
ERR_FAIL_COND
(
!
nv
);
if
(
nv
==
p_node
)
{
continue
;
}
_toggle_visible
(
nv
);
}
}
}
bool
SceneTreeEditor
::
_add_nodes
(
Node
*
p_node
,
TreeItem
*
p_parent
)
{
if
(
!
p_node
)
...
...
@@ -968,8 +958,6 @@ void SceneTreeEditor::_bind_methods() {
ClassDB
::
bind_method
(
"_cell_collapsed"
,
&
SceneTreeEditor
::
_cell_collapsed
);
ClassDB
::
bind_method
(
"_rmb_select"
,
&
SceneTreeEditor
::
_rmb_select
);
ClassDB
::
bind_method
(
"_warning_changed"
,
&
SceneTreeEditor
::
_warning_changed
);
ClassDB
::
bind_method
(
"_toggle_visible"
,
&
SceneTreeEditor
::
_toggle_visible
);
ClassDB
::
bind_method
(
"toggle_visible"
,
&
SceneTreeEditor
::
toggle_visible
);
ClassDB
::
bind_method
(
"_node_script_changed"
,
&
SceneTreeEditor
::
_node_script_changed
);
ClassDB
::
bind_method
(
"_node_visibility_changed"
,
&
SceneTreeEditor
::
_node_visibility_changed
);
...
...
editor/scene_tree_editor.h
View file @
3b8bd50b
...
...
@@ -70,8 +70,6 @@ class SceneTreeEditor : public Control {
void
_compute_hash
(
Node
*
p_node
,
uint64_t
&
hash
);
void
toggle_visible
(
Node
*
p_node
);
bool
_add_nodes
(
Node
*
p_node
,
TreeItem
*
p_parent
);
void
_test_update_tree
();
void
_update_tree
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment