widget.Importance for every widgets

lunarforge · Jul 17, 2023 · 8edc6d1 · 8edc6d1
1 parent 8c730f7
commit 8edc6d1
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 46 deletions.
diff --git a/container/tabs.go b/container/tabs.go
@@ -490,7 +490,7 @@ type tabButton struct {
 	hovered       bool
 	icon          fyne.Resource
 	iconPosition  buttonIconPosition
-	importance    widget.ButtonImportance
+	importance    widget.Importance
 	onTapped      func()
 	onClosed      func()
 	text          string

diff --git a/dialog/confirm.go b/dialog/confirm.go
@@ -23,7 +23,7 @@ func (d *ConfirmDialog) SetConfirmText(label string) {
 // SetConfirmImportance sets the importance level of the confirm button.
 //
 // Since 2.4
-func (d *ConfirmDialog) SetConfirmImportance(importance widget.ButtonImportance) {
+func (d *ConfirmDialog) SetConfirmImportance(importance widget.Importance) {
 	d.confirm.Importance = importance
 }
 

diff --git a/widget/button.go b/widget/button.go
@@ -21,7 +21,8 @@ type ButtonIconPlacement int
 // ButtonImportance represents how prominent the button should appear
 //
 // Since: 1.4
-type ButtonImportance int
+// Deprecated: Use widget.Importance instead
+type ButtonImportance Importance
 
 // ButtonStyle determines the behaviour and rendering of a button.
 type ButtonStyle int
@@ -42,24 +43,6 @@ const (
 	ButtonIconTrailingText
 )
 
-const (
-	// MediumImportance applies a standard appearance.
-	MediumImportance ButtonImportance = iota
-	// HighImportance applies a prominent appearance.
-	HighImportance
-	// LowImportance applies a subtle appearance.
-	LowImportance
-
-	// DangerImportance applies an error theme to the button.
-	//
-	// Since 2.3
-	DangerImportance
-	// WarningImportance applies an error theme to the button.
-	//
-	// Since 2.3
-	WarningImportance
-)
-
 var _ fyne.Focusable = (*Button)(nil)
 
 // Button widget has a text label and triggers an event func when clicked
@@ -70,7 +53,7 @@ type Button struct {
 	// Specify how prominent the button should be, High will highlight the button and Low will remove some decoration.
 	//
 	// Since: 1.4
-	Importance    ButtonImportance
+	Importance    Importance
 	Alignment     ButtonAlign
 	IconPlacement ButtonIconPlacement
 

diff --git a/widget/importance.go b/widget/importance.go
@@ -0,0 +1,24 @@
+package widget
+
+type Importance int
+
+const (
+	// MediumImportance applies a standard appearance.
+	MediumImportance Importance = iota
+	// HighImportance applies a prominent appearance.
+	HighImportance
+	// LowImportance applies a subtle appearance.
+	LowImportance
+
+	// DangerImportance applies an error theme to the widget.
+	//
+	// Since 2.3
+	DangerImportance
+	// WarningImportance applies a warning theme to the widget.
+	//
+	// Since 2.3
+	WarningImportance
+
+	// SuccessImportance applies a success theme to the widget.
+	SuccessImportance
+)
diff --git a/widget/label.go b/widget/label.go
@@ -7,22 +7,6 @@ import (
 	"fyne.io/fyne/v2/theme"
 )
 
-// TextImportance represents how colored the text should appear
-type TextImportance int
-
-const (
-	// TextImportanceNormal applies a standard appearance.
-	TextImportanceNormal TextImportance = iota
-	// TextImportanceSuccess applies a success color.
-	TextImportanceSuccess
-	// TextImportanceWarning applies a warning color.
-	TextImportanceWarning
-	// TextImportanceError applies an error color.
-	TextImportanceError
-	// TextImportanceDisabled applies a disabled color.
-	TextImportanceDisabled
-)
-
 // Label widget is a label component with appropriate padding and layout.
 type Label struct {
 	BaseWidget
@@ -31,7 +15,7 @@ type Label struct {
 	Wrapping   fyne.TextWrap  // The wrapping of the Text
 	TextStyle  fyne.TextStyle // The style of the label text
 	provider   *RichText
-	Importance TextImportance
+	Importance Importance
 
 	binder basicBinder
 }
@@ -144,14 +128,18 @@ func (l *Label) Unbind() {
 func (l *Label) syncSegments() {
 	var color fyne.ThemeColorName
 	switch l.Importance {
-	case TextImportanceSuccess:
-		color = theme.ColorNameSuccess
-	case TextImportanceWarning:
-		color = theme.ColorNameWarning
-	case TextImportanceError:
-		color = theme.ColorNameError
-	case TextImportanceDisabled:
+	case LowImportance:
 		color = theme.ColorNameDisabled
+	case MediumImportance:
+		color = theme.ColorNameForeground
+	case HighImportance:
+		color = theme.ColorNamePrimary
+	case DangerImportance:
+		color = theme.ColorNameError
+	case WarningImportance:
+		color = theme.ColorNameWarning
+	case SuccessImportance:
+		color = theme.ColorNameSuccess
 	default:
 		color = theme.ColorNameForeground
 	}