Add default theme customization

mounirtohami · Dec 20, 2024 · 765f404 · 765f404
1 parent ae52eb2
commit 765f404
Show file tree

Hide file tree

Showing 85 changed files with 2,181 additions and 82 deletions.
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
@@ -449,9 +449,11 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 		// Only the default theme and the project theme are used for the list of options.
 		// This is an imposed limitation to simplify the logic needed to leverage those options.
 		ThemeDB::get_singleton()->get_default_theme()->get_type_variation_list(get_class_name(), &names);
+#ifndef PIXEL_ENGINE
 		if (ThemeDB::get_singleton()->get_project_theme().is_valid()) {
 			ThemeDB::get_singleton()->get_project_theme()->get_type_variation_list(get_class_name(), &names);
 		}
+#endif // !PIXEL_ENGINE
 		names.sort_custom<StringName::AlphCompare>();
 
 		Vector<StringName> unique_names;

diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -247,11 +247,11 @@ void Window::_validate_property(PropertyInfo &p_property) const {
 		// Only the default theme and the project theme are used for the list of options.
 		// This is an imposed limitation to simplify the logic needed to leverage those options.
 		ThemeDB::get_singleton()->get_default_theme()->get_type_variation_list(get_class_name(), &names);
-#ifdef TOOLS_ENABLED
+#ifndef PIXEL_ENGINE
 		if (ThemeDB::get_singleton()->get_project_theme().is_valid()) {
 			ThemeDB::get_singleton()->get_project_theme()->get_type_variation_list(get_class_name(), &names);
 		}
-#endif // TOOLS_ENABLED
+#endif // !PIXEL_ENGINE
 		names.sort_custom<StringName::AlphCompare>();
 
 		Vector<StringName> unique_names;

diff --git a/scene/theme/SCsub b/scene/theme/SCsub
@@ -5,7 +5,12 @@ Import("env")
 
 import default_theme_builders
 
-env.add_source_files(env.scene_sources, "*.cpp")
+env.add_source_files(env.scene_sources, ["theme_db.cpp", "theme_owner.cpp"])
+
+if env.pixel_engine:
+    env.add_source_files(env.scene_sources, "pixel_default_theme.cpp")
+else:
+    env.add_source_files(env.scene_sources, "default_theme.cpp")
 
 SConscript("icons/SCsub")
 

diff --git a/scene/theme/icons/SCsub b/scene/theme/icons/SCsub
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from misc.utility.scons_hints import *
 
 Import("env")
 

diff --git a/scene/theme/icons/add.svg b/scene/theme/icons/add.svg
diff --git a/scene/theme/icons/arrow_down.svg b/scene/theme/icons/arrow_down.svg
diff --git a/scene/theme/icons/arrow_left.svg b/scene/theme/icons/arrow_left.svg
diff --git a/scene/theme/icons/arrow_right.svg b/scene/theme/icons/arrow_right.svg
diff --git a/scene/theme/icons/bookmark.svg b/scene/theme/icons/bookmark.svg
diff --git a/scene/theme/icons/breakpoint.svg b/scene/theme/icons/breakpoint.svg
diff --git a/scene/theme/icons/checked.svg b/scene/theme/icons/checked.svg
diff --git a/scene/theme/icons/checked_disabled.svg b/scene/theme/icons/checked_disabled.svg
diff --git a/scene/theme/icons/close.svg b/scene/theme/icons/close.svg
diff --git a/scene/theme/icons/close_hl.svg b/scene/theme/icons/close_hl.svg
diff --git a/scene/theme/icons/color_picker_bar_arrow.svg b/scene/theme/icons/color_picker_bar_arrow.svg
diff --git a/scene/theme/icons/color_picker_cursor.svg b/scene/theme/icons/color_picker_cursor.svg
diff --git a/scene/theme/icons/color_picker_cursor_bg.svg b/scene/theme/icons/color_picker_cursor_bg.svg
diff --git a/scene/theme/icons/color_picker_hex.svg b/scene/theme/icons/color_picker_hex.svg
diff --git a/scene/theme/icons/color_picker_hex_code.svg b/scene/theme/icons/color_picker_hex_code.svg
diff --git a/scene/theme/icons/color_picker_overbright.svg b/scene/theme/icons/color_picker_overbright.svg
diff --git a/scene/theme/icons/color_picker_pipette.svg b/scene/theme/icons/color_picker_pipette.svg
diff --git a/scene/theme/icons/error_icon.svg b/scene/theme/icons/error_icon.svg
diff --git a/scene/theme/icons/file.svg b/scene/theme/icons/file.svg
diff --git a/scene/theme/icons/folder.svg b/scene/theme/icons/folder.svg
diff --git a/scene/theme/icons/folder_create.svg b/scene/theme/icons/folder_create.svg
diff --git a/scene/theme/icons/folder_up.svg b/scene/theme/icons/folder_up.svg
diff --git a/scene/theme/icons/graph_port.svg b/scene/theme/icons/graph_port.svg
diff --git a/scene/theme/icons/grid_layout.svg b/scene/theme/icons/grid_layout.svg
diff --git a/scene/theme/icons/grid_minimap.svg b/scene/theme/icons/grid_minimap.svg
diff --git a/scene/theme/icons/grid_snap.svg b/scene/theme/icons/grid_snap.svg
diff --git a/scene/theme/icons/grid_toggle.svg b/scene/theme/icons/grid_toggle.svg
diff --git a/scene/theme/icons/hslider_tick.svg b/scene/theme/icons/hslider_tick.svg
diff --git a/scene/theme/icons/indeterminate.svg b/scene/theme/icons/indeterminate.svg
diff --git a/scene/theme/icons/indeterminate_disabled.svg b/scene/theme/icons/indeterminate_disabled.svg
diff --git a/scene/theme/icons/line_edit_clear.svg b/scene/theme/icons/line_edit_clear.svg
diff --git a/scene/theme/icons/mini_checkerboard.svg b/scene/theme/icons/mini_checkerboard.svg