godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

New API for visibility in both CanvasItem and Spatial

Browse Source 
visible (property) - access set_visible(bool) is_visible()
is_visible_in_tree() - true when visible and parents visible
show() hide() - for convenience
This commit is contained in:
Juan Linietsky
2017-01-13 10:45:50 -03:00
parent a2903fc51d
commit 04c749a1f0
72 changed files with 252 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/plugins/script_editor_plugin.cpp
View File

@@ -426,14 +426,14 @@ void ScriptEditor::_go_to_tab(int p_idx) {
script_name_label->set_text(c->cast_to<ScriptEditorBase>()->get_name());
script_icon->set_texture(c->cast_to<ScriptEditorBase>()->get_icon());
if (is_visible())
if (is_visible_in_tree())
c->cast_to<ScriptEditorBase>()->ensure_focus();
}
if (c->cast_to<EditorHelp>()) {
script_name_label->set_text(c->cast_to<EditorHelp>()->get_class());
script_icon->set_texture(get_icon("Help","EditorIcons"));
if (is_visible())
if (is_visible_in_tree())
c->cast_to<EditorHelp>()->set_focused();
}
@@ -1281,7 +1281,7 @@ void ScriptEditor::ensure_select_current() {
Ref<Script> script = se->get_edited_script();
if (!grab_focus_block && is_visible())
if (!grab_focus_block && is_visible_in_tree())
se->ensure_focus();
@@ -1516,7 +1516,7 @@ void ScriptEditor::edit(const Ref<Script>& p_script, bool p_grab_focus) {
_go_to_tab(i);
script_list->select( script_list->find_metadata(i) );
}
if (is_visible())
if (is_visible_in_tree())
se->ensure_focus();
}
return;
@@ -1744,7 +1744,7 @@ void ScriptEditor::_script_split_dragged(float) {
}
void ScriptEditor::_unhandled_input(const InputEvent& p_event) {
if (p_event.key.pressed || !is_visible()) return;
if (p_event.key.pressed || !is_visible_in_tree()) return;
if (ED_IS_SHORTCUT("script_editor/next_script", p_event)) {
int next_tab = script_list->get_current() + 1;
next_tab %= script_list->get_item_count();