Skip to content

Commit fd8ddca

Browse files
RepiteoRepiteo
committed
Merge pull request godotengine#111649 from KoBeWi/DESNAME
Improvements to ProjectManager's `_update_theme()`
2 parents fc985d7 + 8f1b411 commit fd8ddca

File tree

1 file changed

+42
-41
lines changed

1 file changed

+42
-41
lines changed

‎editor/project_manager/project_manager.cpp‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void ProjectManager::_update_size_limits() {
198198
void ProjectManager::_update_theme(bool p_skip_creation) {
199199
if (!p_skip_creation) {
200200
theme = EditorThemeManager::generate_theme(theme);
201-
DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor)));
201+
DisplayServer::set_early_window_clear_color_override(true, theme->get_color("background", EditorStringName(Editor)));
202202
}
203203

204204
Vector<Ref<Theme>> editor_themes;
@@ -224,74 +224,75 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
224224

225225
// Update styles.
226226
{
227-
const int top_bar_separation = get_theme_constant(SNAME("top_bar_separation"), EditorStringName(Editor));
227+
const int top_bar_separation = get_theme_constant("top_bar_separation", EditorStringName(Editor));
228228
root_container->add_theme_constant_override("margin_left", top_bar_separation);
229229
root_container->add_theme_constant_override("margin_top", top_bar_separation);
230230
root_container->add_theme_constant_override("margin_bottom", top_bar_separation);
231231
root_container->add_theme_constant_override("margin_right", top_bar_separation);
232232
main_vbox->add_theme_constant_override("separation", top_bar_separation);
233233

234-
background_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("Background"), EditorStringName(EditorStyles)));
235-
main_view_container->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("TabContainer")));
234+
background_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox("Background", EditorStringName(EditorStyles)));
235+
main_view_container->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), "TabContainer"));
236236

237-
title_bar_logo->set_button_icon(get_editor_theme_icon(SNAME("TitleBarLogo")));
237+
title_bar_logo->set_button_icon(get_editor_theme_icon("TitleBarLogo"));
238238

239-
_set_main_view_icon(MAIN_VIEW_PROJECTS, get_editor_theme_icon(SNAME("ProjectList")));
240-
_set_main_view_icon(MAIN_VIEW_ASSETLIB, get_editor_theme_icon(SNAME("AssetLib")));
239+
_set_main_view_icon(MAIN_VIEW_PROJECTS, get_editor_theme_icon("ProjectList"));
240+
_set_main_view_icon(MAIN_VIEW_ASSETLIB, get_editor_theme_icon("AssetLib"));
241241

242242
// Project list.
243243
{
244-
loading_label->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
245-
project_list_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("project_list"), SNAME("ProjectManager")));
244+
loading_label->add_theme_font_override(SceneStringName(font), get_theme_font("bold", EditorStringName(EditorFonts)));
245+
project_list_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox("project_list", "ProjectManager"));
246246

247-
empty_list_create_project->set_button_icon(get_editor_theme_icon(SNAME("Add")));
248-
empty_list_import_project->set_button_icon(get_editor_theme_icon(SNAME("Load")));
249-
empty_list_open_assetlib->set_button_icon(get_editor_theme_icon(SNAME("AssetLib")));
247+
empty_list_create_project->set_button_icon(get_editor_theme_icon("Add"));
248+
empty_list_import_project->set_button_icon(get_editor_theme_icon("Load"));
249+
empty_list_open_assetlib->set_button_icon(get_editor_theme_icon("AssetLib"));
250250

251-
empty_list_online_warning->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("italic"), EditorStringName(EditorFonts)));
252-
empty_list_online_warning->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("font_placeholder_color"), EditorStringName(Editor)));
251+
empty_list_online_warning->add_theme_font_override(SceneStringName(font), get_theme_font("italic", EditorStringName(EditorFonts)));
252+
empty_list_online_warning->add_theme_color_override(SceneStringName(font_color), get_theme_color("font_placeholder_color", EditorStringName(Editor)));
253253

254254
// Top bar.
255-
search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
256-
quick_settings_button->set_button_icon(get_editor_theme_icon(SNAME("Tools")));
255+
search_box->set_right_icon(get_editor_theme_icon("Search"));
256+
quick_settings_button->set_button_icon(get_editor_theme_icon("Tools"));
257257

258258
// Sidebar.
259-
create_btn->set_button_icon(get_editor_theme_icon(SNAME("Add")));
260-
import_btn->set_button_icon(get_editor_theme_icon(SNAME("Load")));
261-
scan_btn->set_button_icon(get_editor_theme_icon(SNAME("Search")));
262-
open_btn->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
263-
open_options_btn->set_button_icon(get_editor_theme_icon(SNAME("Collapse")));
264-
run_btn->set_button_icon(get_editor_theme_icon(SNAME("Play")));
265-
rename_btn->set_button_icon(get_editor_theme_icon(SNAME("Rename")));
266-
duplicate_btn->set_button_icon(get_editor_theme_icon(SNAME("Duplicate")));
259+
create_btn->set_button_icon(get_editor_theme_icon("Add"));
260+
import_btn->set_button_icon(get_editor_theme_icon("Load"));
261+
scan_btn->set_button_icon(get_editor_theme_icon("Search"));
262+
open_btn->set_button_icon(get_editor_theme_icon("Edit"));
263+
open_options_btn->set_button_icon(get_editor_theme_icon("Collapse"));
264+
run_btn->set_button_icon(get_editor_theme_icon("Play"));
265+
rename_btn->set_button_icon(get_editor_theme_icon("Rename"));
266+
duplicate_btn->set_button_icon(get_editor_theme_icon("Duplicate"));
267267
manage_tags_btn->set_button_icon(get_editor_theme_icon("Script"));
268268
show_in_fm_btn->set_button_icon(get_editor_theme_icon("Load"));
269-
erase_btn->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
270-
erase_missing_btn->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
269+
erase_btn->set_button_icon(get_editor_theme_icon("Remove"));
270+
erase_missing_btn->set_button_icon(get_editor_theme_icon("Clear"));
271271
create_tag_btn->set_button_icon(get_editor_theme_icon("Add"));
272272

273273
tag_error->add_theme_color_override(SceneStringName(font_color), get_theme_color("error_color", EditorStringName(Editor)));
274274
tag_edit_error->add_theme_color_override(SceneStringName(font_color), get_theme_color("error_color", EditorStringName(Editor)));
275275

276-
create_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
277-
import_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
278-
scan_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
279-
open_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
280-
run_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
281-
rename_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
282-
duplicate_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
283-
manage_tags_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
284-
show_in_fm_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
285-
erase_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
286-
erase_missing_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
276+
const int h_separation = get_theme_constant("sidebar_button_icon_separation", "ProjectManager");
277+
create_btn->add_theme_constant_override("h_separation", h_separation);
278+
import_btn->add_theme_constant_override("h_separation", h_separation);
279+
scan_btn->add_theme_constant_override("h_separation", h_separation);
280+
open_btn->add_theme_constant_override("h_separation", h_separation);
281+
run_btn->add_theme_constant_override("h_separation", h_separation);
282+
rename_btn->add_theme_constant_override("h_separation", h_separation);
283+
duplicate_btn->add_theme_constant_override("h_separation", h_separation);
284+
manage_tags_btn->add_theme_constant_override("h_separation", h_separation);
285+
show_in_fm_btn->add_theme_constant_override("h_separation", h_separation);
286+
erase_btn->add_theme_constant_override("h_separation", h_separation);
287+
erase_missing_btn->add_theme_constant_override("h_separation", h_separation);
287288

288289
open_btn_container->add_theme_constant_override("separation", 0);
289-
open_options_popup->set_item_icon(0, get_editor_theme_icon(SNAME("Notification")));
290-
open_options_popup->set_item_icon(1, get_editor_theme_icon(SNAME("NodeWarning")));
290+
open_options_popup->set_item_icon(0, get_editor_theme_icon("Notification"));
291+
open_options_popup->set_item_icon(1, get_editor_theme_icon("NodeWarning"));
291292
}
292293

293294
// Dialogs
294-
migration_guide_button->set_button_icon(get_editor_theme_icon(SNAME("ExternalLink")));
295+
migration_guide_button->set_button_icon(get_editor_theme_icon("ExternalLink"));
295296

296297
// Asset library popup.
297298
if (asset_library) {
@@ -300,7 +301,7 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
300301
}
301302
}
302303
#ifdef ANDROID_ENABLED
303-
DisplayServer::get_singleton()->window_set_color(theme->get_color(SNAME("background"), EditorStringName(Editor)));
304+
DisplayServer::get_singleton()->window_set_color(theme->get_color("background", EditorStringName(Editor)));
304305
#endif
305306
}
306307

0 commit comments

Comments
 (0)