Transparent background for LowImportance Button

This makes sure that we don't change the background for disabled button with LowImportance. As a benefit, this makes the SelectEntry look a lot better when disabled. Fixes fyne-io#3139
lunarforge · Jul 15, 2022 · 70651db · 70651db
1 parent ab10573
commit 70651db
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/widget/button.go b/widget/button.go
@@ -337,6 +337,9 @@ func (r *buttonRenderer) applyTheme() {
 func (r *buttonRenderer) buttonColor() color.Color {
 	switch {
 	case r.button.Disabled():
+		if r.button.Importance == LowImportance {
+			return color.Transparent
+		}
 		return theme.DisabledButtonColor()
 	case r.button.focused:
 		return blendColor(theme.ButtonColor(), theme.FocusColor())

diff --git a/widget/button_test.go b/widget/button_test.go
@@ -121,6 +121,20 @@ func TestButton_Disabled(t *testing.T) {
 	assert.False(t, button.Disabled())
 }
 
+func TestButton_LowImportance(t *testing.T) {
+	test.NewApp()
+	defer test.NewApp()
+
+	b := &widget.Button{Text: "Text", Icon: theme.HomeIcon(), Importance: widget.LowImportance}
+	w := test.NewWindow(b)
+	defer w.Close()
+
+	test.AssertImageMatches(t, "button/low_importance.png", w.Canvas().Capture())
+
+	b.Disable()
+	test.AssertImageMatches(t, "button/low_importance_disabled.png", w.Canvas().Capture())
+}
+
 func TestButton_Hover(t *testing.T) {
 	test.NewApp()
 	defer test.NewApp()

diff --git a/widget/testdata/button/low_importance.png b/widget/testdata/button/low_importance.png
diff --git a/widget/testdata/button/low_importance_disabled.png b/widget/testdata/button/low_importance_disabled.png
diff --git a/widget/testdata/select_entry/disableable_disabled.xml b/widget/testdata/select_entry/disableable_disabled.xml
@@ -14,7 +14,7 @@
 				</widget>
 			</widget>
 			<widget pos="102,8" size="20x20" type="*widget.Button">
-				<rectangle fillColor="disabled button" size="20x20"/>
+				<rectangle size="20x20"/>
 				<rectangle fillColor="rgba(0,0,0,0)" pos="0,2" size="16x16"/>
 				<image fillMode="contain" rsc="menuDropDownIcon" size="iconInlineSize" themed="disabled"/>
 			</widget>