Update shadows on theme change

Fixes #589
fyne-io · Dec 24, 2019 · 7af37bc · 7af37bc
1 parent 6862874
commit 7af37bc
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 5 deletions.
diff --git a/widget/button.go b/widget/button.go
@@ -13,7 +13,7 @@ import (
 type buttonRenderer struct {
 	icon   *canvas.Image
 	label  *canvas.Text
-	shadow fyne.CanvasObject
+	shadow *shadow
 
 	objects []fyne.CanvasObject
 	button  *Button
@@ -125,6 +125,10 @@ func (b *buttonRenderer) Refresh() {
 		b.icon.Hide()
 	}
 
+	if b.shadow != nil {
+		b.shadow.depth = theme.Padding() / 2
+	}
+
 	b.Layout(b.button.Size())
 	canvas.Refresh(b.button)
 }
@@ -206,7 +210,7 @@ func (b *Button) CreateRenderer() fyne.WidgetRenderer {
 	objects := []fyne.CanvasObject{
 		text,
 	}
-	var shadow fyne.CanvasObject
+	var shadow *shadow
 	if !b.HideShadow {
 		shadow = newShadow(shadowAround, theme.Padding()/2)
 		objects = append(objects, shadow)

diff --git a/widget/scroller.go b/widget/scroller.go
@@ -229,8 +229,8 @@ type scrollContainerRenderer struct {
 	scroll                  *ScrollContainer
 	vertArea                *scrollBarArea
 	horizArea               *scrollBarArea
-	leftShadow, rightShadow fyne.CanvasObject
-	topShadow, bottomShadow fyne.CanvasObject
+	leftShadow, rightShadow *shadow
+	topShadow, bottomShadow *shadow
 
 	objects []fyne.CanvasObject
 }
@@ -273,6 +273,11 @@ func (r *scrollContainerRenderer) Objects() []fyne.CanvasObject {
 }
 
 func (r *scrollContainerRenderer) Refresh() {
+	r.leftShadow.depth = theme.Padding() * 2
+	r.rightShadow.depth = theme.Padding() * 2
+	r.topShadow.depth = theme.Padding() * 2
+	r.bottomShadow.depth = theme.Padding() * 2
+
 	r.Layout(r.scroll.Size())
 }
 

diff --git a/widget/shadow.go b/widget/shadow.go
@@ -81,6 +81,45 @@ func (r *shadowRenderer) createShadows() {
 	}
 }
 
+func updateShadowStart(g *canvas.LinearGradient) {
+	if g == nil {
+		return
+	}
+
+	g.StartColor = theme.ShadowColor()
+	g.Refresh()
+}
+
+func updateShadowEnd(g *canvas.LinearGradient) {
+	if g == nil {
+		return
+	}
+
+	g.EndColor = theme.ShadowColor()
+	g.Refresh()
+}
+
+func updateShadowRadial(g *canvas.RadialGradient) {
+	if g == nil {
+		return
+	}
+
+	g.StartColor = theme.ShadowColor()
+	g.Refresh()
+}
+
+func (r *shadowRenderer) refreshShadows() {
+	updateShadowEnd(r.l)
+	updateShadowStart(r.r)
+	updateShadowStart(r.b)
+	updateShadowEnd(r.t)
+
+	updateShadowRadial(r.tl)
+	updateShadowRadial(r.tr)
+	updateShadowRadial(r.bl)
+	updateShadowRadial(r.br)
+}
+
 func (r *shadowRenderer) BackgroundColor() color.Color {
 	return color.Transparent
 }
@@ -132,5 +171,5 @@ func (r *shadowRenderer) Objects() []fyne.CanvasObject {
 }
 
 func (r *shadowRenderer) Refresh() {
-	r.createShadows()
+	r.refreshShadows()
 }
diff --git a/widget/shadow_test.go b/widget/shadow_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"fyne.io/fyne"
+	"fyne.io/fyne/internal/cache"
 	"fyne.io/fyne/theme"
 	"github.com/stretchr/testify/assert"
 )
@@ -119,3 +120,20 @@ func TestShadow_BackgroundColor(t *testing.T) {
 func TestShadow_MinSize(t *testing.T) {
 	assert.Equal(t, fyne.NewSize(0, 0), newShadow(shadowAround, theme.Padding()).MinSize())
 }
+
+func TestShadow_Theme(t *testing.T) {
+	shadow := newShadow(shadowAround, theme.Padding())
+	light := theme.LightTheme()
+	fyne.CurrentApp().Settings().SetTheme(light)
+	shadow.Refresh()
+	assert.Equal(t, light.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).l.EndColor)
+	assert.Equal(t, light.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).r.StartColor)
+	assert.Equal(t, light.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).tr.StartColor)
+
+	dark := theme.DarkTheme()
+	fyne.CurrentApp().Settings().SetTheme(dark)
+	shadow.Refresh()
+	assert.Equal(t, dark.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).r.StartColor)
+	assert.Equal(t, dark.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).r.StartColor)
+	assert.Equal(t, dark.ShadowColor(), cache.Renderer(shadow).(*shadowRenderer).tr.StartColor)
+}