godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #55484 from pycbouh/theme-load-and-order-3.x

Browse Source
This commit is contained in:
Rémi Verschelde
2021-12-02 17:20:31 +01:00
committed by GitHub
parent 8956c275a1 33fb44223f
commit d5b22e614e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/main.cpp
View File

@@ -1487,6 +1487,9 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
register_platform_apis(); register_platform_apis();
register_module_types(); register_module_types();
// Theme needs modules to be initialized so that sub-resources can be loaded.
initialize_theme();
GLOBAL_DEF("display/mouse_cursor/custom_image", String()); GLOBAL_DEF("display/mouse_cursor/custom_image", String());
GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2()); GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2());
GLOBAL_DEF("display/mouse_cursor/tooltip_position_offset", Point2(10, 10)); GLOBAL_DEF("display/mouse_cursor/tooltip_position_offset", Point2(10, 10));

2
scene/register_scene_types.cpp
View File

@@ -767,7 +767,9 @@ void register_scene_types() {
GLOBAL_DEF("layer_names/2d_physics/layer_" + itos(i + 1), ""); GLOBAL_DEF("layer_names/2d_physics/layer_" + itos(i + 1), "");
GLOBAL_DEF("layer_names/3d_physics/layer_" + itos(i + 1), ""); GLOBAL_DEF("layer_names/3d_physics/layer_" + itos(i + 1), "");
} }
}
void initialize_theme() {
bool default_theme_hidpi = GLOBAL_DEF("gui/theme/use_hidpi", false); bool default_theme_hidpi = GLOBAL_DEF("gui/theme/use_hidpi", false);
ProjectSettings::get_singleton()->set_custom_property_info("gui/theme/use_hidpi", PropertyInfo(Variant::BOOL, "gui/theme/use_hidpi", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)); ProjectSettings::get_singleton()->set_custom_property_info("gui/theme/use_hidpi", PropertyInfo(Variant::BOOL, "gui/theme/use_hidpi", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED));
String theme_path = GLOBAL_DEF_RST("gui/theme/custom", ""); String theme_path = GLOBAL_DEF_RST("gui/theme/custom", "");

2
scene/register_scene_types.h
View File

@@ -34,4 +34,6 @@
void register_scene_types(); void register_scene_types();
void unregister_scene_types(); void unregister_scene_types();
void initialize_theme();
#endif #endif