run selection initialization code on CreateRenderer

dweymouth · Jan 10, 2024 · 9acf942 · 9acf942
1 parent ca10bbe
commit 9acf942
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/widget/radio_group.go b/widget/radio_group.go
@@ -57,7 +57,10 @@ func (r *RadioGroup) CreateRenderer() fyne.WidgetRenderer {
 		})
 	}
 
-	return &radioGroupRenderer{widget.NewBaseRenderer(items), items, r}
+	render := &radioGroupRenderer{widget.NewBaseRenderer(items), items, r}
+	r.updateSelectedIndex()
+	render.updateItems(false)
+	return render
 }
 
 // MinSize returns the size that this widget should not shrink below
@@ -202,11 +205,11 @@ func (r *radioGroupRenderer) MinSize() fyne.Size {
 }
 
 func (r *radioGroupRenderer) Refresh() {
-	r.updateItems()
+	r.updateItems(true)
 	canvas.Refresh(r.radio.super())
 }
 
-func (r *radioGroupRenderer) updateItems() {
+func (r *radioGroupRenderer) updateItems(refresh bool) {
 	if len(r.items) < len(r.radio.Options) {
 		for i := len(r.items); i < len(r.radio.Options); i++ {
 			idx := i
@@ -238,7 +241,7 @@ func (r *radioGroupRenderer) updateItems() {
 			changed = true
 		}
 
-		if changed {
+		if refresh && changed {
 			item.Refresh()
 		}
 	}

diff --git a/widget/radio_group_test.go b/widget/radio_group_test.go
@@ -151,7 +151,6 @@ func TestRadioGroup_Layout(t *testing.T) {
 				Options:    tt.options,
 				Selected:   tt.selected,
 			}
-			radio.Refresh() // set up selectedIndex
 			if tt.disabled {
 				radio.Disable()
 			}