From 29cc86fa6c19c32b44522bdac9726e2392b7182b Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Tue, 29 Nov 2022 23:01:45 +0300 Subject: Copy local theme overrides from Control to Window --- scene/gui/control.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scene/gui/control.h') diff --git a/scene/gui/control.h b/scene/gui/control.h index 3e9bb48a4a..12710f3a93 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -228,12 +228,12 @@ private: StringName theme_type_variation; bool bulk_theme_override = false; - Theme::ThemeIconMap icon_override; - Theme::ThemeStyleMap style_override; - Theme::ThemeFontMap font_override; - Theme::ThemeFontSizeMap font_size_override; - Theme::ThemeColorMap color_override; - Theme::ThemeConstantMap constant_override; + Theme::ThemeIconMap theme_icon_override; + Theme::ThemeStyleMap theme_style_override; + Theme::ThemeFontMap theme_font_override; + Theme::ThemeFontSizeMap theme_font_size_override; + Theme::ThemeColorMap theme_color_override; + Theme::ThemeConstantMap theme_constant_override; mutable HashMap theme_icon_cache; mutable HashMap theme_style_cache; -- cgit v1.2.3