diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-10-07 11:02:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-07 11:02:59 +0200 |
commit | eae742312f757ceb8b10ef3d343733e764a9c36a (patch) | |
tree | 24d46cb2aeadc53a74741e15b77cb7860ba8917e /editor | |
parent | 22181d0a3f26422b6f39fbd7365592683da4601a (diff) | |
parent | cd05ca42479fa9061b872cb7e700bd001ce4dd98 (diff) |
Merge pull request #22770 from Chaosus/fix_inspector_theme
Fix inspector color when theme changed
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_inspector.cpp | 7 | ||||
-rw-r--r-- | editor/inspector_dock.cpp | 15 | ||||
-rw-r--r-- | editor/inspector_dock.h | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index c6258c8493..a90f15004a 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2139,6 +2139,13 @@ void EditorInspector::_notification(int p_what) { } if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { + + if (use_sub_inspector_bg) { + add_style_override("bg", get_stylebox("sub_inspector_bg", "Editor")); + } else if (is_inside_tree()) { + add_style_override("bg", get_stylebox("bg", "Tree")); + } + update_tree(); } } diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 4f4980d83c..750fca2852 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -328,6 +328,21 @@ Container *InspectorDock::get_addon_area() { return this; } +void InspectorDock::_notification(int p_what) { + switch (p_what) { + case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { + set_theme(editor->get_gui_base()->get_theme()); + resource_new_button->set_icon(get_icon("New", "EditorIcons")); + resource_load_button->set_icon(get_icon("Load", "EditorIcons")); + backward_button->set_icon(get_icon("Back", "EditorIcons")); + forward_button->set_icon(get_icon("Forward", "EditorIcons")); + history_menu->set_icon(get_icon("History", "EditorIcons")); + object_menu->set_icon(get_icon("Tools", "EditorIcons")); + warning->set_icon(get_icon("NodeWarning", "EditorIcons")); + } break; + } +} + void InspectorDock::_bind_methods() { ClassDB::bind_method("_menu_option", &InspectorDock::_menu_option); diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 97ef6899dc..57d2a03295 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -118,6 +118,7 @@ class InspectorDock : public VBoxContainer { protected: static void _bind_methods(); + void _notification(int p_what); public: void go_back(); |