hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep track of default theme and project custom default theme seperatelly

Browse source 
Fixes #30288
This commit is contained in:
Bojidar Marinov 2019-07-05 23:32:52 +03:00
parent 4cb0887660
commit 17901da1a8
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
4 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scene/resources/theme.cpp
View file

@ -32,8 +32,6 @@
#include "core/os/file_access.h"
#include "core/print_string.h"
Ref<Theme> Theme::default_theme;
void Theme::_emit_theme_changed() {
emit_changed();
@ -186,11 +184,6 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
}
}
Ref<Theme> Theme::get_default() {
return default_theme;
}
void Theme::set_default_theme_font(const Ref<Font> &p_default_font) {
if (default_theme_font == p_default_font)
@ -215,14 +208,31 @@ Ref<Font> Theme::get_default_theme_font() const {
return default_theme_font;
}
Ref<Theme> Theme::project_default_theme;
Ref<Theme> Theme::default_theme;
Ref<Texture> Theme::default_icon;
Ref<StyleBox> Theme::default_style;
Ref<Font> Theme::default_font;
Ref<Theme> Theme::get_default() {
return default_theme;
}
void Theme::set_default(const Ref<Theme> &p_default) {
default_theme = p_default;
}
Ref<Texture> Theme::default_icon;
Ref<StyleBox> Theme::default_style;
Ref<Font> Theme::default_font;
Ref<Theme> Theme::get_project_default() {
return project_default_theme;
}
void Theme::set_project_default(const Ref<Theme> &p_project_default) {
project_default_theme = p_project_default;
}
void Theme::set_default_icon(const Ref<Texture> &p_icon) {