diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-17 22:36:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 22:36:00 +0200 |
| commit | 2b8342e308762d8621b8866669797f9fab2da873 (patch) | |
| tree | a419f3d0bdb347169554633b60798db848afb7a6 /editor/plugins | |
| parent | 1c1d43ef214f6a8132e8c9a708bf11c0c0192f81 (diff) | |
| parent | a3c2d9a6bdbe3967c8f747e39b2b581729b492c1 (diff) | |
Merge pull request #9652 from djrm/theme_fixes
Improvements and fixes for the default theme.
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 12 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.h | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index dc2eddda39..d10831eea1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -1056,7 +1056,7 @@ void ScriptEditor::_notification(int p_what) { } EditorSettings::get_singleton()->connect("settings_changed", this, "_editor_settings_changed"); - help_search->set_icon(get_icon("Help", "EditorIcons")); + help_search->set_icon(get_icon("HelpSearch", "EditorIcons")); site_search->set_icon(get_icon("Instance", "EditorIcons")); class_search->set_icon(get_icon("ClassList", "EditorIcons")); @@ -2172,11 +2172,17 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { members_overview_enabled = true; editor = p_editor; + Ref<StyleBox> sb = p_editor->get_gui_base()->get_stylebox("panel", "TabContainer")->duplicate(); + sb->set_default_margin(MARGIN_TOP, 0); + add_style_override("panel", sb); + VBoxContainer *main_container = memnew(VBoxContainer); + add_child(main_container); + menu_hb = memnew(HBoxContainer); - add_child(menu_hb); + main_container->add_child(menu_hb); script_split = memnew(HSplitContainer); - add_child(script_split); + main_container->add_child(script_split); script_split->set_v_size_flags(SIZE_EXPAND_FILL); list_split = memnew(VSplitContainer); diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 7f17365931..010a5604ec 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -115,9 +115,9 @@ typedef ScriptEditorBase *(*CreateScriptEditorFunc)(const Ref<Script> &p_script) class EditorScriptCodeCompletionCache; -class ScriptEditor : public VBoxContainer { +class ScriptEditor : public PanelContainer { - GDCLASS(ScriptEditor, VBoxContainer); + GDCLASS(ScriptEditor, PanelContainer); EditorNode *editor; enum { |