Fix issue where toolbar would not completely refresh

Fixes fyne-io#1809
andydotxyz · Jan 16, 2021 · 263fec8 · 263fec8
1 parent 969392b
commit 263fec8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/widget/toolbar.go b/widget/toolbar.go
@@ -137,11 +137,9 @@ func (r *toolbarRenderer) Refresh() {
 }
 
 func (r *toolbarRenderer) resetObjects() {
-	if len(r.items) != len(r.toolbar.Items) {
-		r.items = make([]fyne.CanvasObject, 0, len(r.toolbar.Items))
-		for _, item := range r.toolbar.Items {
-			r.items = append(r.items, item.ToolbarObject())
-		}
+	r.items = make([]fyne.CanvasObject, 0, len(r.toolbar.Items))
+	for _, item := range r.toolbar.Items {
+		r.items = append(r.items, item.ToolbarObject())
 	}
 	r.SetObjects(append([]fyne.CanvasObject{r.background}, r.items...))
 }
diff --git a/widget/toolbar_test.go b/widget/toolbar_test.go
@@ -35,6 +35,18 @@ func TestToolbar_Prepend(t *testing.T) {
 	assert.Equal(t, prepend, toolbar.Items[0])
 }
 
+func TestToolbar_Replace(t *testing.T) {
+	icon := theme.ContentCutIcon()
+	toolbar := NewToolbar(NewToolbarAction(icon, func() {}))
+	assert.Equal(t, 1, len(toolbar.Items))
+	render := test.WidgetRenderer(toolbar)
+	assert.Equal(t, icon, render.Objects()[1].(*Button).Icon)
+
+	toolbar.Items[0] = NewToolbarAction(theme.HelpIcon(), func() {})
+	toolbar.Refresh()
+	assert.NotEqual(t, icon, render.Objects()[1].(*Button).Icon)
+}
+
 func TestToolbar_ItemPositioning(t *testing.T) {
 	toolbar := &Toolbar{
 		Items: []ToolbarItem{