Call callback if dismissed in simple case too

fyne-io · Nov 5, 2024 · f26945b · f26945b
1 parent 3d75849
commit f26945b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/dialog/color.go b/dialog/color.go
@@ -141,6 +141,9 @@ func (p *ColorPickerDialog) updateUI() {
 		p.dialog.create(container.NewGridWithColumns(2, p.dialog.dismiss, confirm))
 	} else {
 		p.dialog.content = container.NewVBox(p.createSimplePickers()...)
+		p.dialog.dismiss.OnTapped = func() {
+			p.callback(nil)
+		}
 		p.dialog.create(container.NewGridWithColumns(1, p.dialog.dismiss))
 	}
 }

diff --git a/dialog/color_test.go b/dialog/color_test.go
@@ -95,26 +95,50 @@ func TestColorDialog_SetColor(t *testing.T) {
 
 func TestColorDialog_Buttons(t *testing.T) {
 	for name, tt := range map[string]struct {
-		action     func(d *ColorPickerDialog, w fyne.Window)
+		action          func(d *ColorPickerDialog, w fyne.Window)
+		advanced        bool
 		expectedCalled  bool
 		expectedColored bool
 	}{
-		"confirm": {
+		"confirmAdvanced": {
 			action: func(d *ColorPickerDialog, w fyne.Window) {
 				test.FocusNext(w.Canvas()) // advanced accordion
 				test.FocusNext(w.Canvas()) // dismiss button
 				test.FocusNext(w.Canvas()) // confirm button
 				w.Canvas().Focused().TypedKey(&fyne.KeyEvent{Name: fyne.KeySpace})
 			},
+			advanced:        true,
 			expectedCalled:  true,
 			expectedColored: true,
 		},
-		"dismiss": {
+		"dismissAdvanced": {
 			action: func(d *ColorPickerDialog, w fyne.Window) {
 				test.FocusNext(w.Canvas()) // advanced accordion
 				test.FocusNext(w.Canvas()) // dismiss button
 				w.Canvas().Focused().TypedKey(&fyne.KeyEvent{Name: fyne.KeySpace})
 			},
+			advanced:        true,
+			expectedCalled:  true,
+			expectedColored: false,
+		},
+		"confirmSimple": {
+			action: func(d *ColorPickerDialog, w fyne.Window) {
+				test.FocusNext(w.Canvas()) // advanced accordion
+				test.FocusNext(w.Canvas()) // dismiss button
+				test.FocusNext(w.Canvas()) // confirm button
+				w.Canvas().Focused().TypedKey(&fyne.KeyEvent{Name: fyne.KeySpace})
+			},
+			advanced:        false,
+			expectedCalled:  true,
+			expectedColored: true,
+		},
+		"dismissSimple": {
+			action: func(d *ColorPickerDialog, w fyne.Window) {
+				test.FocusNext(w.Canvas()) // advanced accordion
+				test.FocusNext(w.Canvas()) // dismiss button
+				w.Canvas().Focused().TypedKey(&fyne.KeyEvent{Name: fyne.KeySpace})
+			},
+			advanced:        false,
 			expectedCalled:  true,
 			expectedColored: false,
 		},