Move default theme files to scene/theme

This also puts the default theme icons into their own folder.

.github/CODEOWNERS

@@ -154,11 +154,11 @@ doc_classes/*                       @godotengine/documentation
 /scene/debugger/                    @godotengine/debugger
 /scene/gui/                         @godotengine/gui-nodes
 /scene/main/                        @godotengine/core
-/scene/resources/default_theme/     @godotengine/gui-nodes
 /scene/resources/font.*             @godotengine/gui-nodes
 /scene/resources/text_line.*        @godotengine/gui-nodes
 /scene/resources/text_paragraph.*   @godotengine/gui-nodes
 /scene/resources/visual_shader*.*   @godotengine/shaders
+/scene/theme/                       @godotengine/gui-nodes
 
 # Servers
 

editor/editor_fonts.cpp

@@ -34,7 +34,6 @@
 #include "core/io/dir_access.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/font.h"
 
 Ref<FontFile> load_external_font(const String &p_path, TextServer::Hinting p_hinting, TextServer::FontAntialiasing p_aa, bool p_autohint, TextServer::SubpixelPositioning p_font_subpixel_positioning, bool p_msdf = false, TypedArray<Font> *r_fallbacks = nullptr) {

editor/editor_themes.cpp

@@ -245,7 +245,7 @@ static Ref<StyleBoxLine> make_line_stylebox(Color p_color, int p_thickness = 1,
 	return style;
 }
 
-// See also `generate_icon()` in `scene/resources/default_theme.cpp`.
+// See also `generate_icon()` in `scene/theme/default_theme.cpp`.
 static Ref<ImageTexture> editor_generate_icon(int p_index, float p_scale, float p_saturation, const HashMap<Color, Color> &p_convert_colors = HashMap<Color, Color>()) {
 	Ref<Image> img = memnew(Image);
 

editor/icons/editor_icons_builders.py

@@ -9,7 +9,7 @@ from io import StringIO
 from platform_methods import subprocess_main
 
 
-# See also `scene/resources/default_theme/default_theme_icons_builders.py`.
+# See also `scene/theme/icons/default_theme_icons_builders.py`.
 def make_editor_icons_action(target, source, env):
     dst = target[0]
     svg_icons = source

scene/register_scene_types.cpp

@@ -159,7 +159,6 @@
 #include "scene/resources/convex_polygon_shape_3d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/font.h"
 #include "scene/resources/gradient.h"

scene/resources/SCsub

@@ -22,5 +22,3 @@ env.scene_sources += scene_obj
 
 # Needed to force rebuilding the scene files when the thirdparty code is updated.
 env.Depends(scene_obj, thirdparty_obj)
-
-SConscript("default_theme/SCsub")

scene/resources/default_theme/SCsub

@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-
-Import("env")
-
-from platform_methods import run_in_subprocess
-import default_theme_builders
-import default_theme_icons_builders
-
-env.add_source_files(env.scene_sources, "*.cpp")
-
-env.Depends("#scene/resources/default_theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2")
-env.CommandNoCache(
-    "#scene/resources/default_theme/default_font.gen.h",
-    "#thirdparty/fonts/OpenSans_SemiBold.woff2",
-    run_in_subprocess(default_theme_builders.make_fonts_header),
-)
-
-env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder(
-    action=env.Run(
-        default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header."
-    ),
-    suffix=".h",
-    src_suffix=".svg",
-)
-
-# Default theme icons
-icon_sources = Glob("*.svg")
-
-env.Alias(
-    "default_theme_icons",
-    [env.MakeDefaultThemeIconsBuilder("#scene/resources/default_theme/default_theme_icons.gen.h", icon_sources)],
-)

scene/theme/SCsub

@@ -2,4 +2,17 @@
 
 Import("env")
 
+from platform_methods import run_in_subprocess
+import default_theme_builders
+
+
 env.add_source_files(env.scene_sources, "*.cpp")
+
+SConscript("icons/SCsub")
+
+env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2")
+env.CommandNoCache(
+    "#scene/theme/default_font.gen.h",
+    "#thirdparty/fonts/OpenSans_SemiBold.woff2",
+    run_in_subprocess(default_theme_builders.make_fonts_header),
+)

scene/theme/icons/SCsub

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+Import("env")
+
+import default_theme_icons_builders
+
+
+env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder(
+    action=env.Run(
+        default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header."
+    ),
+    suffix=".h",
+    src_suffix=".svg",
+)
+
+# Default theme icons
+icon_sources = Glob("*.svg")
+
+env.Alias(
+    "default_theme_icons",
+    [env.MakeDefaultThemeIconsBuilder("#scene/theme/default_theme_icons.gen.h", icon_sources)],
+)

scene/theme/theme_db.cpp

@@ -32,11 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/font.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 #include "scene/resources/theme.h"
+#include "scene/theme/default_theme.h"
 #include "servers/text_server.h"
 
 // Default engine theme creation and configuration.