godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34393 from Chaosus/fix_toggle_scripts_panel

Browse Source 
Prevent showing toggle scripts panel switch in shader editor
This commit is contained in:
Yuri Roubinsky 2019-12-17 11:43:06 +03:00 committed by GitHub
commit accf68b2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/code_editor.cpp
View File

@ -1527,7 +1527,9 @@ void CodeTextEditor::_notification(int p_what) {
emit_signal("load_theme_settings"); emit_signal("load_theme_settings");
} break; } break;
case NOTIFICATION_THEME_CHANGED: { case NOTIFICATION_THEME_CHANGED: {
if (toggle_scripts_button->is_visible()) {
toggle_scripts_button->set_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? get_icon("Back", "EditorIcons") : get_icon("Forward", "EditorIcons")); toggle_scripts_button->set_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? get_icon("Back", "EditorIcons") : get_icon("Forward", "EditorIcons"));
}
_update_font(); _update_font();
} break; } break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
@ -1643,6 +1645,10 @@ void CodeTextEditor::set_code_complete_func(CodeTextEditorCodeCompleteFunc p_cod
code_complete_ud = p_ud; code_complete_ud = p_ud;
} }
void CodeTextEditor::show_toggle_scripts_button() {
toggle_scripts_button->show();
}
CodeTextEditor::CodeTextEditor() { CodeTextEditor::CodeTextEditor() {
code_complete_func = NULL; code_complete_func = NULL;
@ -1688,6 +1694,7 @@ CodeTextEditor::CodeTextEditor() {
toggle_scripts_button->connect("pressed", this, "_toggle_scripts_pressed"); toggle_scripts_button->connect("pressed", this, "_toggle_scripts_pressed");
status_bar->add_child(toggle_scripts_button); status_bar->add_child(toggle_scripts_button);
toggle_scripts_button->set_shortcut(ED_SHORTCUT("script_editor/toggle_scripts_panel", TTR("Toggle Scripts Panel"), KEY_MASK_CMD | KEY_BACKSLASH)); toggle_scripts_button->set_shortcut(ED_SHORTCUT("script_editor/toggle_scripts_panel", TTR("Toggle Scripts Panel"), KEY_MASK_CMD | KEY_BACKSLASH));
toggle_scripts_button->hide();
// Error // Error
ScrollContainer *scroll = memnew(ScrollContainer); ScrollContainer *scroll = memnew(ScrollContainer);

2
editor/code_editor.h
View File

@ -255,6 +255,8 @@ public:
void validate_script(); void validate_script();
void show_toggle_scripts_button();
CodeTextEditor(); CodeTextEditor();
}; };

1
editor/plugins/script_text_editor.cpp
View File

@ -1760,6 +1760,7 @@ ScriptTextEditor::ScriptTextEditor() {
code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol"); code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol");
code_editor->get_text_edit()->connect("info_clicked", this, "_lookup_connections"); code_editor->get_text_edit()->connect("info_clicked", this, "_lookup_connections");
code_editor->set_v_size_flags(SIZE_EXPAND_FILL); code_editor->set_v_size_flags(SIZE_EXPAND_FILL);
code_editor->show_toggle_scripts_button();
warnings_panel = memnew(RichTextLabel); warnings_panel = memnew(RichTextLabel);
editor_box->add_child(warnings_panel); editor_box->add_child(warnings_panel);