1 files changed, 31 insertions, 29 deletions

diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp
index 63a2db4569..fe609dd834 100644
--- a/scene/gui/progress_bar.cpp
+++ b/scene/gui/progress_bar.cpp
@@ -33,18 +33,13 @@
 #include "scene/resources/text_line.h"
 
 Size2 ProgressBar::get_minimum_size() const {
-	Ref<StyleBox> bg = get_theme_stylebox(SNAME("bg"));
-	Ref<StyleBox> fg = get_theme_stylebox(SNAME("fg"));
-	Ref<Font> font = get_theme_font(SNAME("font"));
-	int font_size = get_theme_font_size(SNAME("font_size"));
-
-	Size2 minimum_size = bg->get_minimum_size();
-	minimum_size.height = MAX(minimum_size.height, fg->get_minimum_size().height);
-	minimum_size.width = MAX(minimum_size.width, fg->get_minimum_size().width);
+	Size2 minimum_size = theme_cache.bg_style->get_minimum_size();
+	minimum_size.height = MAX(minimum_size.height, theme_cache.fg_style->get_minimum_size().height);
+	minimum_size.width = MAX(minimum_size.width, theme_cache.fg_style->get_minimum_size().width);
 	if (percent_visible) {
 		String txt = "100%";
-		TextLine tl = TextLine(txt, font, font_size);
-		minimum_size.height = MAX(minimum_size.height, bg->get_minimum_size().height + tl.get_size().y);
+		TextLine tl = TextLine(txt, theme_cache.font, theme_cache.font_size);
+		minimum_size.height = MAX(minimum_size.height, theme_cache.bg_style->get_minimum_size().height + tl.get_size().y);
 	} else { // this is needed, else the progressbar will collapse
 		minimum_size.width = MAX(minimum_size.width, 1);
 		minimum_size.height = MAX(minimum_size.height, 1);
@@ -52,23 +47,30 @@ Size2 ProgressBar::get_minimum_size() const {
 	return minimum_size;
 }
 
+void ProgressBar::_update_theme_item_cache() {
+	Range::_update_theme_item_cache();
+
+	theme_cache.bg_style = get_theme_stylebox(SNAME("bg"));
+	theme_cache.fg_style = get_theme_stylebox(SNAME("fg"));
+
+	theme_cache.font = get_theme_font(SNAME("font"));
+	theme_cache.font_size = get_theme_font_size(SNAME("font_size"));
+	theme_cache.font_color = get_theme_color(SNAME("font_color"));
+	theme_cache.font_outline_size = get_theme_constant(SNAME("outline_size"));
+	theme_cache.font_outline_color = get_theme_color(SNAME("font_outline_color"));
+}
+
 void ProgressBar::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
-			Ref<StyleBox> bg = get_theme_stylebox(SNAME("bg"));
-			Ref<StyleBox> fg = get_theme_stylebox(SNAME("fg"));
-			Ref<Font> font = get_theme_font(SNAME("font"));
-			int font_size = get_theme_font_size(SNAME("font_size"));
-			Color font_color = get_theme_color(SNAME("font_color"));
-
-			draw_style_box(bg, Rect2(Point2(), get_size()));
+			draw_style_box(theme_cache.bg_style, Rect2(Point2(), get_size()));
 
 			float r = get_as_ratio();
 
 			switch (mode) {
 				case FILL_BEGIN_TO_END:
 				case FILL_END_TO_BEGIN: {
-					int mp = fg->get_minimum_size().width;
+					int mp = theme_cache.fg_style->get_minimum_size().width;
 					int p = round(r * (get_size().width - mp));
 					// We want FILL_BEGIN_TO_END to map to right to left when UI layout is RTL,
 					// and left to right otherwise. And likewise for FILL_END_TO_BEGIN.
@@ -76,23 +78,23 @@ void ProgressBar::_notification(int p_what) {
 					if (p > 0) {
 						if (right_to_left) {
 							int p_remaining = round((1.0 - r) * (get_size().width - mp));
-							draw_style_box(fg, Rect2(Point2(p_remaining, 0), Size2(p + fg->get_minimum_size().width, get_size().height)));
+							draw_style_box(theme_cache.fg_style, Rect2(Point2(p_remaining, 0), Size2(p + theme_cache.fg_style->get_minimum_size().width, get_size().height)));
 						} else {
-							draw_style_box(fg, Rect2(Point2(0, 0), Size2(p + fg->get_minimum_size().width, get_size().height)));
+							draw_style_box(theme_cache.fg_style, Rect2(Point2(0, 0), Size2(p + theme_cache.fg_style->get_minimum_size().width, get_size().height)));
 						}
 					}
 				} break;
 				case FILL_TOP_TO_BOTTOM:
 				case FILL_BOTTOM_TO_TOP: {
-					int mp = fg->get_minimum_size().height;
+					int mp = theme_cache.fg_style->get_minimum_size().height;
 					int p = round(r * (get_size().height - mp));
 
 					if (p > 0) {
 						if (mode == FILL_TOP_TO_BOTTOM) {
-							draw_style_box(fg, Rect2(Point2(0, 0), Size2(get_size().width, p + fg->get_minimum_size().height)));
+							draw_style_box(theme_cache.fg_style, Rect2(Point2(0, 0), Size2(get_size().width, p + theme_cache.fg_style->get_minimum_size().height)));
 						} else {
 							int p_remaining = round((1.0 - r) * (get_size().height - mp));
-							draw_style_box(fg, Rect2(Point2(0, p_remaining), Size2(get_size().width, p + fg->get_minimum_size().height)));
+							draw_style_box(theme_cache.fg_style, Rect2(Point2(0, p_remaining), Size2(get_size().width, p + theme_cache.fg_style->get_minimum_size().height)));
 						}
 					}
 				} break;
@@ -102,14 +104,14 @@ void ProgressBar::_notification(int p_what) {
 
 			if (percent_visible) {
 				String txt = TS->format_number(itos(int(get_as_ratio() * 100))) + TS->percent_sign();
-				TextLine tl = TextLine(txt, font, font_size);
+				TextLine tl = TextLine(txt, theme_cache.font, theme_cache.font_size);
 				Vector2 text_pos = (Point2(get_size().width - tl.get_size().x, get_size().height - tl.get_size().y) / 2).round();
-				Color font_outline_color = get_theme_color(SNAME("font_outline_color"));
-				int outline_size = get_theme_constant(SNAME("outline_size"));
-				if (outline_size > 0 && font_outline_color.a > 0) {
-					tl.draw_outline(get_canvas_item(), text_pos, outline_size, font_outline_color);
+
+				if (theme_cache.font_outline_size > 0 && theme_cache.font_outline_color.a > 0) {
+					tl.draw_outline(get_canvas_item(), text_pos, theme_cache.font_outline_size, theme_cache.font_outline_color);
 				}
-				tl.draw(get_canvas_item(), text_pos, font_color);
+
+				tl.draw(get_canvas_item(), text_pos, theme_cache.font_color);
 			}
 		} break;
 	}