widget: Make BaseWidget theme lookup code more readable

fyne-io · Jan 9, 2025 · 6ecf5db · 6ecf5db
1 parent 61e206b
commit 6ecf5db
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/widget/widget.go b/widget/widget.go
@@ -132,16 +132,17 @@ func (w *BaseWidget) Refresh() {
 // Since: 2.5
 func (w *BaseWidget) Theme() fyne.Theme {
 	cached := w.themeCache
-	if cached == nil {
-		cached = cache.WidgetTheme(w.super())
-		// don't cache the default as it may change
-		if cached == nil {
-			return theme.Current()
-		}
+	if cached != nil {
+		return cached
+	}
 
-		w.themeCache = cached
+	cached = cache.WidgetTheme(w.super())
+	// don't cache the default as it may change
+	if cached == nil {
+		return theme.Current()
 	}
 
+	w.themeCache = cached
 	return cached
 }