diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-01-16 12:55:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 12:55:01 +0100 |
| commit | 4b55c81ebae48c53e88654a42c04365391b6159d (patch) | |
| tree | 842d2a5d83aaff9bd82e56e77c9412d735967e10 /editor/project_manager.cpp | |
| parent | 6bb89c71ff65ee117a7dce4576026d716ee390e5 (diff) | |
| parent | dc3b07e5515f71ee4a0c55217b12e98e098ea3e9 (diff) | |
| download | redot-engine-4b55c81ebae48c53e88654a42c04365391b6159d.tar.gz | |
Merge pull request #87085 from YuriSizov/editor-improved-theme-flexibility
Refactor editor theme generation and add spacing presets
Diffstat (limited to 'editor/project_manager.cpp')
| -rw-r--r-- | editor/project_manager.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index c986ce215a..e7277bad6a 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -42,13 +42,14 @@ #include "core/string/translation.h" #include "core/version.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" -#include "editor/editor_themes.h" #include "editor/editor_vcs_interface.h" #include "editor/gui/editor_file_dialog.h" #include "editor/plugins/asset_library_editor_plugin.h" +#include "editor/themes/editor_icons.h" +#include "editor/themes/editor_scale.h" +#include "editor/themes/editor_theme_manager.h" #include "main/main.h" #include "scene/gui/center_container.h" #include "scene/gui/check_box.h" @@ -2879,9 +2880,8 @@ ProjectManager::ProjectManager() { Control::set_root_layout_direction(pm_root_dir); Window::set_root_layout_direction(pm_root_dir); - EditorColorMap::create(); - EditorTheme::initialize(); - Ref<Theme> theme = create_custom_theme(); + EditorThemeManager::initialize(); + Ref<Theme> theme = EditorThemeManager::generate_theme(); DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor))); set_theme(theme); @@ -3317,8 +3317,7 @@ ProjectManager::~ProjectManager() { EditorSettings::destroy(); } - EditorColorMap::finish(); - EditorTheme::finalize(); + EditorThemeManager::finalize(); } void ProjectTag::_notification(int p_what) { |