diff --git a/container/apptabs.go b/container/apptabs.go
index 9becbb065f..23df54ab06 100644
--- a/container/apptabs.go
+++ b/container/apptabs.go
@@ -52,7 +52,7 @@ func (t *AppTabs) CreateRenderer() fyne.WidgetRenderer {
baseTabsRenderer: baseTabsRenderer{
bar: &fyne.Container{},
divider: canvas.NewRectangle(theme.Color(theme.ColorNameShadow)),
- indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimary)),
+ indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimaryOnBackground)),
},
appTabs: t,
}
diff --git a/container/apptabs_extend_test.go b/container/apptabs_extend_test.go
index 19b99a9569..77dccff034 100644
--- a/container/apptabs_extend_test.go
+++ b/container/apptabs_extend_test.go
@@ -35,25 +35,25 @@ func TestAppTabs_Extended_Tapped(t *testing.T) {
tab1 := r.bar.Objects[0].(*fyne.Container).Objects[0].(*tabButton)
tab2 := r.bar.Objects[0].(*fyne.Container).Objects[1].(*tabButton)
require.Equal(t, 0, tabs.SelectedIndex())
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())
tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())
tab1.Tapped(&fyne.PointEvent{})
assert.Equal(t, 0, tabs.SelectedIndex())
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.True(t, tabs.Items[0].Content.Visible())
assert.False(t, tabs.Items[1].Content.Visible())
diff --git a/container/doctabs.go b/container/doctabs.go
index 6981800461..953a028f7a 100644
--- a/container/doctabs.go
+++ b/container/doctabs.go
@@ -60,7 +60,7 @@ func (t *DocTabs) CreateRenderer() fyne.WidgetRenderer {
baseTabsRenderer: baseTabsRenderer{
bar: &fyne.Container{},
divider: canvas.NewRectangle(theme.Color(theme.ColorNameShadow)),
- indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimary)),
+ indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimaryOnBackground)),
},
docTabs: t,
scroller: NewScroll(&fyne.Container{}),
diff --git a/container/doctabs_extend_test.go b/container/doctabs_extend_test.go
index 5fdaadfedc..db808b093b 100644
--- a/container/doctabs_extend_test.go
+++ b/container/doctabs_extend_test.go
@@ -36,25 +36,25 @@ func TestDocTabs_Extended_Tapped(t *testing.T) {
tab1 := buttons[0].(*tabButton)
tab2 := buttons[1].(*tabButton)
require.Equal(t, 0, tabs.SelectedIndex())
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())
tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())
tab1.Tapped(&fyne.PointEvent{})
assert.Equal(t, 0, tabs.SelectedIndex())
- require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
+ require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.True(t, tabs.Items[0].Content.Visible())
assert.False(t, tabs.Items[1].Content.Visible())
diff --git a/container/tabs.go b/container/tabs.go
index c8747e49ce..e5ff9c9b00 100644
--- a/container/tabs.go
+++ b/container/tabs.go
@@ -305,7 +305,7 @@ func (r *baseTabsRenderer) applyTheme(t baseTabs) {
r.action.SetIcon(moreIcon(t))
}
r.divider.FillColor = theme.Color(theme.ColorNameShadow)
- r.indicator.FillColor = theme.Color(theme.ColorNamePrimary)
+ r.indicator.FillColor = theme.Color(theme.ColorNamePrimaryOnBackground)
r.indicator.CornerRadius = theme.SelectionRadiusSize()
for _, tab := range r.tabs.items() {
@@ -425,7 +425,7 @@ func (r *baseTabsRenderer) moveIndicator(pos fyne.Position, siz fyne.Size, anima
r.sizeAnimation = nil
}
- r.indicator.FillColor = theme.Color(theme.ColorNamePrimary)
+ r.indicator.FillColor = theme.Color(theme.ColorNamePrimaryOnBackground)
if r.indicator.Position().IsZero() {
r.indicator.Move(pos)
r.indicator.Resize(siz)
@@ -670,7 +670,7 @@ func (r *tabButtonRenderer) Refresh() {
r.label.Alignment = r.button.textAlignment
if !r.button.Disabled() {
if r.button.importance == widget.HighImportance {
- r.label.Color = theme.Color(theme.ColorNamePrimary)
+ r.label.Color = theme.Color(theme.ColorNamePrimaryOnBackground)
} else {
r.label.Color = theme.Color(theme.ColorNameForeground)
}
diff --git a/container/testdata/apptabs/desktop/change_icon_change_selected.xml b/container/testdata/apptabs/desktop/change_icon_change_selected.xml
index 809f31f8b2..1049553042 100644
--- a/container/testdata/apptabs/desktop/change_icon_change_selected.xml
+++ b/container/testdata/apptabs/desktop/change_icon_change_selected.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/change_icon_change_unselected.xml b/container/testdata/apptabs/desktop/change_icon_change_unselected.xml
index b3e2bf2b41..ea710bf152 100644
--- a/container/testdata/apptabs/desktop/change_icon_change_unselected.xml
+++ b/container/testdata/apptabs/desktop/change_icon_change_unselected.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/change_icon_initial.xml b/container/testdata/apptabs/desktop/change_icon_initial.xml
index e2314b8cb7..38fa91250a 100644
--- a/container/testdata/apptabs/desktop/change_icon_initial.xml
+++ b/container/testdata/apptabs/desktop/change_icon_initial.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/change_label_change_selected.xml b/container/testdata/apptabs/desktop/change_label_change_selected.xml
index e2d749ae45..712562de3e 100644
--- a/container/testdata/apptabs/desktop/change_label_change_selected.xml
+++ b/container/testdata/apptabs/desktop/change_label_change_selected.xml
@@ -4,7 +4,7 @@
- New 1
+ New 1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/change_label_change_unselected.xml b/container/testdata/apptabs/desktop/change_label_change_unselected.xml
index 4bb6a249b7..ba29bbc0a7 100644
--- a/container/testdata/apptabs/desktop/change_label_change_unselected.xml
+++ b/container/testdata/apptabs/desktop/change_label_change_unselected.xml
@@ -4,7 +4,7 @@
- New 1
+ New 1
New 2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/change_label_initial.xml b/container/testdata/apptabs/desktop/change_label_initial.xml
index ac1d7faa30..3c9f14d65d 100644
--- a/container/testdata/apptabs/desktop/change_label_initial.xml
+++ b/container/testdata/apptabs/desktop/change_label_initial.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/dynamic_appended.xml b/container/testdata/apptabs/desktop/dynamic_appended.xml
index 0057080e1b..78cdc30c25 100644
--- a/container/testdata/apptabs/desktop/dynamic_appended.xml
+++ b/container/testdata/apptabs/desktop/dynamic_appended.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml b/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml
index 250d25e0ce..842eaaa92b 100644
--- a/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml
+++ b/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml
@@ -4,12 +4,12 @@
- Test2
+ Test2
-
+
Text 2
diff --git a/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml b/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml
index 0d92e32d8d..bcb0428807 100644
--- a/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml
+++ b/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml
@@ -4,7 +4,7 @@
- Test2
+ Test2
Test3
@@ -18,7 +18,7 @@
-
+
Text 2
diff --git a/container/testdata/apptabs/desktop/dynamic_initial.xml b/container/testdata/apptabs/desktop/dynamic_initial.xml
index 4d918199cc..56fe72a1be 100644
--- a/container/testdata/apptabs/desktop/dynamic_initial.xml
+++ b/container/testdata/apptabs/desktop/dynamic_initial.xml
@@ -4,12 +4,12 @@
- Test1
+ Test1
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml b/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml
index eed0d552ac..65c6ba742c 100644
--- a/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml
+++ b/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml
@@ -4,7 +4,7 @@
- Test6
+ Test6
Test7
@@ -15,7 +15,7 @@
-
+
Text 6
diff --git a/container/testdata/apptabs/desktop/hover_first.xml b/container/testdata/apptabs/desktop/hover_first.xml
index 4d6d1eaa4a..5465edffe8 100644
--- a/container/testdata/apptabs/desktop/hover_first.xml
+++ b/container/testdata/apptabs/desktop/hover_first.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -13,7 +13,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/hover_none.xml b/container/testdata/apptabs/desktop/hover_none.xml
index ac1d7faa30..3c9f14d65d 100644
--- a/container/testdata/apptabs/desktop/hover_none.xml
+++ b/container/testdata/apptabs/desktop/hover_none.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/hover_overflow.xml b/container/testdata/apptabs/desktop/hover_overflow.xml
index 89865fcffc..0a1ccc4e09 100644
--- a/container/testdata/apptabs/desktop/hover_overflow.xml
+++ b/container/testdata/apptabs/desktop/hover_overflow.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -17,7 +17,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/hover_second.xml b/container/testdata/apptabs/desktop/hover_second.xml
index f9ebbefd6f..53f8b9b884 100644
--- a/container/testdata/apptabs/desktop/hover_second.xml
+++ b/container/testdata/apptabs/desktop/hover_second.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -13,7 +13,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/desktop/layout_bottom_icon.xml b/container/testdata/apptabs/desktop/layout_bottom_icon.xml
index aa44b4de03..b81ea83f3c 100644
--- a/container/testdata/apptabs/desktop/layout_bottom_icon.xml
+++ b/container/testdata/apptabs/desktop/layout_bottom_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml b/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml
index b209e628d3..e2a0a24e51 100644
--- a/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml
+++ b/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/desktop/layout_bottom_text.xml b/container/testdata/apptabs/desktop/layout_bottom_text.xml
index 01b3e1080e..e9fbeb03fb 100644
--- a/container/testdata/apptabs/desktop/layout_bottom_text.xml
+++ b/container/testdata/apptabs/desktop/layout_bottom_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/desktop/layout_leading_icon.xml b/container/testdata/apptabs/desktop/layout_leading_icon.xml
index 6aa761e764..4acb54b0a4 100644
--- a/container/testdata/apptabs/desktop/layout_leading_icon.xml
+++ b/container/testdata/apptabs/desktop/layout_leading_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml b/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml
index 9b5c630815..66ad32ac38 100644
--- a/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml
+++ b/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/desktop/layout_leading_text.xml b/container/testdata/apptabs/desktop/layout_leading_text.xml
index c2e8b8fd75..8258f94cf3 100644
--- a/container/testdata/apptabs/desktop/layout_leading_text.xml
+++ b/container/testdata/apptabs/desktop/layout_leading_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/desktop/layout_top_icon.xml b/container/testdata/apptabs/desktop/layout_top_icon.xml
index 7642539797..035c28ecd3 100644
--- a/container/testdata/apptabs/desktop/layout_top_icon.xml
+++ b/container/testdata/apptabs/desktop/layout_top_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml b/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml
index c3a9a0aa23..da1cbaa052 100644
--- a/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml
+++ b/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/desktop/layout_top_text.xml b/container/testdata/apptabs/desktop/layout_top_text.xml
index 61e45027e9..e0f6b6a295 100644
--- a/container/testdata/apptabs/desktop/layout_top_text.xml
+++ b/container/testdata/apptabs/desktop/layout_top_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/desktop/layout_trailing_icon.xml b/container/testdata/apptabs/desktop/layout_trailing_icon.xml
index 42e31f0c9d..7d9884dbad 100644
--- a/container/testdata/apptabs/desktop/layout_trailing_icon.xml
+++ b/container/testdata/apptabs/desktop/layout_trailing_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml b/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml
index 13dda3d3a0..43c4998828 100644
--- a/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml
+++ b/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/desktop/layout_trailing_text.xml b/container/testdata/apptabs/desktop/layout_trailing_text.xml
index ac66156c95..41de2ab832 100644
--- a/container/testdata/apptabs/desktop/layout_trailing_text.xml
+++ b/container/testdata/apptabs/desktop/layout_trailing_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/desktop/tab_location_bottom.xml b/container/testdata/apptabs/desktop/tab_location_bottom.xml
index 28ef841355..947c09c564 100644
--- a/container/testdata/apptabs/desktop/tab_location_bottom.xml
+++ b/container/testdata/apptabs/desktop/tab_location_bottom.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tab_location_leading.xml b/container/testdata/apptabs/desktop/tab_location_leading.xml
index 3929f7e8a7..3f3730617d 100644
--- a/container/testdata/apptabs/desktop/tab_location_leading.xml
+++ b/container/testdata/apptabs/desktop/tab_location_leading.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tab_location_top.xml b/container/testdata/apptabs/desktop/tab_location_top.xml
index 0770b32445..75a6751a67 100644
--- a/container/testdata/apptabs/desktop/tab_location_top.xml
+++ b/container/testdata/apptabs/desktop/tab_location_top.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tab_location_trailing.xml b/container/testdata/apptabs/desktop/tab_location_trailing.xml
index 21bca15141..fc4b4e9a25 100644
--- a/container/testdata/apptabs/desktop/tab_location_trailing.xml
+++ b/container/testdata/apptabs/desktop/tab_location_trailing.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tapped_first_selected.xml b/container/testdata/apptabs/desktop/tapped_first_selected.xml
index fbf5fe8c10..e66a5e7555 100644
--- a/container/testdata/apptabs/desktop/tapped_first_selected.xml
+++ b/container/testdata/apptabs/desktop/tapped_first_selected.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -15,7 +15,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
index 72ad2b4349..3fddd2267b 100644
--- a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
+++ b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -17,7 +17,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tapped_overflow_tabs_disabled.xml b/container/testdata/apptabs/desktop/tapped_overflow_tabs_disabled.xml
index c8b8030fbb..b2fd4f7279 100644
--- a/container/testdata/apptabs/desktop/tapped_overflow_tabs_disabled.xml
+++ b/container/testdata/apptabs/desktop/tapped_overflow_tabs_disabled.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -17,7 +17,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/desktop/tapped_second_selected.xml b/container/testdata/apptabs/desktop/tapped_second_selected.xml
index 81fa2c075f..9abc5f8cc8 100644
--- a/container/testdata/apptabs/desktop/tapped_second_selected.xml
+++ b/container/testdata/apptabs/desktop/tapped_second_selected.xml
@@ -7,7 +7,7 @@
Test1
- Test2
+ Test2
Test3
@@ -15,7 +15,7 @@
-
+
Text 2
diff --git a/container/testdata/apptabs/desktop/tapped_third_selected.xml b/container/testdata/apptabs/desktop/tapped_third_selected.xml
index 3883391981..b060978dc3 100644
--- a/container/testdata/apptabs/desktop/tapped_third_selected.xml
+++ b/container/testdata/apptabs/desktop/tapped_third_selected.xml
@@ -10,12 +10,12 @@
Test2
- Test3
+ Test3
-
+
Text 3
diff --git a/container/testdata/apptabs/mobile/change_icon_change_selected.xml b/container/testdata/apptabs/mobile/change_icon_change_selected.xml
index 8d3c2d95f5..7a2a388782 100644
--- a/container/testdata/apptabs/mobile/change_icon_change_selected.xml
+++ b/container/testdata/apptabs/mobile/change_icon_change_selected.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/change_icon_change_unselected.xml b/container/testdata/apptabs/mobile/change_icon_change_unselected.xml
index fdb7fabb40..938a98ea2d 100644
--- a/container/testdata/apptabs/mobile/change_icon_change_unselected.xml
+++ b/container/testdata/apptabs/mobile/change_icon_change_unselected.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/change_icon_initial.xml b/container/testdata/apptabs/mobile/change_icon_initial.xml
index cdb284c656..7bd419d8f9 100644
--- a/container/testdata/apptabs/mobile/change_icon_initial.xml
+++ b/container/testdata/apptabs/mobile/change_icon_initial.xml
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/change_label_change_selected.xml b/container/testdata/apptabs/mobile/change_label_change_selected.xml
index 54fe2f032a..6d70662853 100644
--- a/container/testdata/apptabs/mobile/change_label_change_selected.xml
+++ b/container/testdata/apptabs/mobile/change_label_change_selected.xml
@@ -4,7 +4,7 @@
- New 1
+ New 1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/change_label_change_unselected.xml b/container/testdata/apptabs/mobile/change_label_change_unselected.xml
index cc8339234b..3ec13ccd28 100644
--- a/container/testdata/apptabs/mobile/change_label_change_unselected.xml
+++ b/container/testdata/apptabs/mobile/change_label_change_unselected.xml
@@ -4,7 +4,7 @@
- New 1
+ New 1
New 2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/change_label_initial.xml b/container/testdata/apptabs/mobile/change_label_initial.xml
index ea9f224dc8..66b76f763b 100644
--- a/container/testdata/apptabs/mobile/change_label_initial.xml
+++ b/container/testdata/apptabs/mobile/change_label_initial.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/dynamic_appended.xml b/container/testdata/apptabs/mobile/dynamic_appended.xml
index 816b42c20a..78b1bf2afc 100644
--- a/container/testdata/apptabs/mobile/dynamic_appended.xml
+++ b/container/testdata/apptabs/mobile/dynamic_appended.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml b/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml
index 68ccd4053b..2514ebe1c2 100644
--- a/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml
+++ b/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml
@@ -4,12 +4,12 @@
- Test2
+ Test2
-
+
Text 2
diff --git a/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml b/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml
index 9c98189c08..7ef73d6255 100644
--- a/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml
+++ b/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml
@@ -4,7 +4,7 @@
- Test2
+ Test2
Test3
@@ -18,7 +18,7 @@
-
+
Text 2
diff --git a/container/testdata/apptabs/mobile/dynamic_initial.xml b/container/testdata/apptabs/mobile/dynamic_initial.xml
index 0f9d592de9..5b14f397c3 100644
--- a/container/testdata/apptabs/mobile/dynamic_initial.xml
+++ b/container/testdata/apptabs/mobile/dynamic_initial.xml
@@ -4,12 +4,12 @@
- Test1
+ Test1
-
+
Text 1
diff --git a/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml b/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml
index d594138582..ec817253d9 100644
--- a/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml
+++ b/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml
@@ -4,7 +4,7 @@
- Test6
+ Test6
Test7
@@ -15,7 +15,7 @@
-
+
Text 6
diff --git a/container/testdata/apptabs/mobile/hover_none.xml b/container/testdata/apptabs/mobile/hover_none.xml
index ea9f224dc8..66b76f763b 100644
--- a/container/testdata/apptabs/mobile/hover_none.xml
+++ b/container/testdata/apptabs/mobile/hover_none.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -12,7 +12,7 @@
-
+
Text1
diff --git a/container/testdata/apptabs/mobile/layout_bottom_icon.xml b/container/testdata/apptabs/mobile/layout_bottom_icon.xml
index 610292a5b8..1f2fa197a7 100644
--- a/container/testdata/apptabs/mobile/layout_bottom_icon.xml
+++ b/container/testdata/apptabs/mobile/layout_bottom_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml b/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml
index 4e151fb475..eeec449cff 100644
--- a/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml
+++ b/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/mobile/layout_bottom_text.xml b/container/testdata/apptabs/mobile/layout_bottom_text.xml
index 4e90156770..d0674cbc70 100644
--- a/container/testdata/apptabs/mobile/layout_bottom_text.xml
+++ b/container/testdata/apptabs/mobile/layout_bottom_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/mobile/layout_top_icon.xml b/container/testdata/apptabs/mobile/layout_top_icon.xml
index bf8410a7d1..280c2a9b6c 100644
--- a/container/testdata/apptabs/mobile/layout_top_icon.xml
+++ b/container/testdata/apptabs/mobile/layout_top_icon.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml b/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml
index 4a19d84472..d90406d8c9 100644
--- a/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml
+++ b/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml
@@ -4,13 +4,13 @@
- Text1
+ Text1
-
+
diff --git a/container/testdata/apptabs/mobile/layout_top_text.xml b/container/testdata/apptabs/mobile/layout_top_text.xml
index 27893e2eb3..fbe5c466dc 100644
--- a/container/testdata/apptabs/mobile/layout_top_text.xml
+++ b/container/testdata/apptabs/mobile/layout_top_text.xml
@@ -4,12 +4,12 @@
- Text2
+ Text2
-
+
diff --git a/container/testdata/apptabs/mobile/tab_location_bottom.xml b/container/testdata/apptabs/mobile/tab_location_bottom.xml
index f498c34598..9df89b90dc 100644
--- a/container/testdata/apptabs/mobile/tab_location_bottom.xml
+++ b/container/testdata/apptabs/mobile/tab_location_bottom.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/mobile/tab_location_top.xml b/container/testdata/apptabs/mobile/tab_location_top.xml
index 06fd981143..c1773f429f 100644
--- a/container/testdata/apptabs/mobile/tab_location_top.xml
+++ b/container/testdata/apptabs/mobile/tab_location_top.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
@@ -14,7 +14,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/mobile/tapped_first_selected.xml b/container/testdata/apptabs/mobile/tapped_first_selected.xml
index 6003208953..56c03fc37a 100644
--- a/container/testdata/apptabs/mobile/tapped_first_selected.xml
+++ b/container/testdata/apptabs/mobile/tapped_first_selected.xml
@@ -4,7 +4,7 @@
- Test1
+ Test1
Test2
@@ -15,7 +15,7 @@
-
+
Text 1
diff --git a/container/testdata/apptabs/mobile/tapped_second_selected.xml b/container/testdata/apptabs/mobile/tapped_second_selected.xml
index 1702362b68..b5709859a5 100644
--- a/container/testdata/apptabs/mobile/tapped_second_selected.xml
+++ b/container/testdata/apptabs/mobile/tapped_second_selected.xml
@@ -7,7 +7,7 @@
Test1
- Test2
+ Test2
Test3
@@ -15,7 +15,7 @@
-
+
Text 2
diff --git a/container/testdata/apptabs/mobile/tapped_third_selected.xml b/container/testdata/apptabs/mobile/tapped_third_selected.xml
index 64876da1d4..5ab9dbcecb 100644
--- a/container/testdata/apptabs/mobile/tapped_third_selected.xml
+++ b/container/testdata/apptabs/mobile/tapped_third_selected.xml
@@ -10,12 +10,12 @@
Test2
- Test3
+ Test3
-
+
Text 3
diff --git a/container/testdata/doctabs/desktop/change_content_change_hidden.xml b/container/testdata/doctabs/desktop/change_content_change_hidden.xml
index 7498439180..26ce5f8942 100644
--- a/container/testdata/doctabs/desktop/change_content_change_hidden.xml
+++ b/container/testdata/doctabs/desktop/change_content_change_hidden.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -29,7 +29,7 @@
-
+
Text3
diff --git a/container/testdata/doctabs/desktop/change_content_change_visible.xml b/container/testdata/doctabs/desktop/change_content_change_visible.xml
index 7498439180..26ce5f8942 100644
--- a/container/testdata/doctabs/desktop/change_content_change_visible.xml
+++ b/container/testdata/doctabs/desktop/change_content_change_visible.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -29,7 +29,7 @@
-
+
Text3
diff --git a/container/testdata/doctabs/desktop/change_content_initial.xml b/container/testdata/doctabs/desktop/change_content_initial.xml
index 41b7b7b020..1f483fea4d 100644
--- a/container/testdata/doctabs/desktop/change_content_initial.xml
+++ b/container/testdata/doctabs/desktop/change_content_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -29,7 +29,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_icon_change_selected.xml b/container/testdata/doctabs/desktop/change_icon_change_selected.xml
index 1a06ef8d0f..f11f39db85 100644
--- a/container/testdata/doctabs/desktop/change_icon_change_selected.xml
+++ b/container/testdata/doctabs/desktop/change_icon_change_selected.xml
@@ -21,7 +21,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_icon_change_unselected.xml b/container/testdata/doctabs/desktop/change_icon_change_unselected.xml
index 93302e3bc1..a3d0bfb6e8 100644
--- a/container/testdata/doctabs/desktop/change_icon_change_unselected.xml
+++ b/container/testdata/doctabs/desktop/change_icon_change_unselected.xml
@@ -21,7 +21,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_icon_initial.xml b/container/testdata/doctabs/desktop/change_icon_initial.xml
index d637f4bbdc..9f2c9bfa6b 100644
--- a/container/testdata/doctabs/desktop/change_icon_initial.xml
+++ b/container/testdata/doctabs/desktop/change_icon_initial.xml
@@ -21,7 +21,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_label_change_selected.xml b/container/testdata/doctabs/desktop/change_label_change_selected.xml
index 9287081375..c290cae626 100644
--- a/container/testdata/doctabs/desktop/change_label_change_selected.xml
+++ b/container/testdata/doctabs/desktop/change_label_change_selected.xml
@@ -5,7 +5,7 @@
- New 1
+ New 1
Test2
@@ -29,7 +29,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_label_change_unselected.xml b/container/testdata/doctabs/desktop/change_label_change_unselected.xml
index 6f52f36780..cb0de7f63a 100644
--- a/container/testdata/doctabs/desktop/change_label_change_unselected.xml
+++ b/container/testdata/doctabs/desktop/change_label_change_unselected.xml
@@ -5,7 +5,7 @@
- New 1
+ New 1
New 2
@@ -29,7 +29,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_label_initial.xml b/container/testdata/doctabs/desktop/change_label_initial.xml
index 41b7b7b020..1f483fea4d 100644
--- a/container/testdata/doctabs/desktop/change_label_initial.xml
+++ b/container/testdata/doctabs/desktop/change_label_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -29,7 +29,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml b/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml
index 8c7d991fb7..6b98efb777 100644
--- a/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml
+++ b/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml
@@ -5,7 +5,7 @@
- New longer text 1
+ New longer text 1
New 2
@@ -21,7 +21,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/dynamic_appended.xml b/container/testdata/doctabs/desktop/dynamic_appended.xml
index cc2356a973..060f43d9f8 100644
--- a/container/testdata/doctabs/desktop/dynamic_appended.xml
+++ b/container/testdata/doctabs/desktop/dynamic_appended.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -21,7 +21,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml b/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml
index 78840555f3..55b5195a0a 100644
--- a/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml
+++ b/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml
@@ -5,7 +5,7 @@
- Test2
+ Test2
@@ -18,7 +18,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml b/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
index cdfb7bc10d..bd474aab3f 100644
--- a/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
+++ b/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
@@ -5,7 +5,7 @@
- Test2
+ Test2
Test3
@@ -35,7 +35,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/desktop/dynamic_initial.xml b/container/testdata/doctabs/desktop/dynamic_initial.xml
index 0a4e4d8293..0a17e2523f 100644
--- a/container/testdata/doctabs/desktop/dynamic_initial.xml
+++ b/container/testdata/doctabs/desktop/dynamic_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -18,7 +18,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml b/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml
index b67be65511..0a7ad3eb64 100644
--- a/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml
+++ b/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml
@@ -5,7 +5,7 @@
- Test6
+ Test6
Test7
@@ -24,7 +24,7 @@
-
+
Text 6
diff --git a/container/testdata/doctabs/desktop/hover_all_tabs.xml b/container/testdata/doctabs/desktop/hover_all_tabs.xml
index cd72d624c1..eac2c4c9e2 100644
--- a/container/testdata/doctabs/desktop/hover_all_tabs.xml
+++ b/container/testdata/doctabs/desktop/hover_all_tabs.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -34,7 +34,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/hover_create_tab.xml b/container/testdata/doctabs/desktop/hover_create_tab.xml
index da399289ad..e2014a79f8 100644
--- a/container/testdata/doctabs/desktop/hover_create_tab.xml
+++ b/container/testdata/doctabs/desktop/hover_create_tab.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -34,7 +34,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/hover_first.xml b/container/testdata/doctabs/desktop/hover_first.xml
index 2083946e8b..a0748d2182 100644
--- a/container/testdata/doctabs/desktop/hover_first.xml
+++ b/container/testdata/doctabs/desktop/hover_first.xml
@@ -6,7 +6,7 @@
- Test1
+ Test1
@@ -38,7 +38,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/hover_first_close.xml b/container/testdata/doctabs/desktop/hover_first_close.xml
index da399289ad..e2014a79f8 100644
--- a/container/testdata/doctabs/desktop/hover_first_close.xml
+++ b/container/testdata/doctabs/desktop/hover_first_close.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -34,7 +34,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/hover_none.xml b/container/testdata/doctabs/desktop/hover_none.xml
index 1606ae3df4..958c8acb73 100644
--- a/container/testdata/doctabs/desktop/hover_none.xml
+++ b/container/testdata/doctabs/desktop/hover_none.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -34,7 +34,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/hover_second.xml b/container/testdata/doctabs/desktop/hover_second.xml
index da399289ad..e2014a79f8 100644
--- a/container/testdata/doctabs/desktop/hover_second.xml
+++ b/container/testdata/doctabs/desktop/hover_second.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -34,7 +34,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/desktop/layout_bottom_icon.xml b/container/testdata/doctabs/desktop/layout_bottom_icon.xml
index 50959caa51..9b23849c58 100644
--- a/container/testdata/doctabs/desktop/layout_bottom_icon.xml
+++ b/container/testdata/doctabs/desktop/layout_bottom_icon.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml b/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml
index 134e9dd86b..6ee72e43ca 100644
--- a/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml
+++ b/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -19,7 +19,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_bottom_text.xml b/container/testdata/doctabs/desktop/layout_bottom_text.xml
index 1f56ee7df1..7b32452cde 100644
--- a/container/testdata/doctabs/desktop/layout_bottom_text.xml
+++ b/container/testdata/doctabs/desktop/layout_bottom_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_leading_icon.xml b/container/testdata/doctabs/desktop/layout_leading_icon.xml
index bd3cf5382c..f1b9058d87 100644
--- a/container/testdata/doctabs/desktop/layout_leading_icon.xml
+++ b/container/testdata/doctabs/desktop/layout_leading_icon.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml b/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml
index 02f8209357..11f16fee1c 100644
--- a/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml
+++ b/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -19,7 +19,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_leading_text.xml b/container/testdata/doctabs/desktop/layout_leading_text.xml
index 6ea774962f..34c2b60761 100644
--- a/container/testdata/doctabs/desktop/layout_leading_text.xml
+++ b/container/testdata/doctabs/desktop/layout_leading_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_top_icon.xml b/container/testdata/doctabs/desktop/layout_top_icon.xml
index 0b9c48639b..051f5875de 100644
--- a/container/testdata/doctabs/desktop/layout_top_icon.xml
+++ b/container/testdata/doctabs/desktop/layout_top_icon.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml b/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml
index 5184c5279b..967377515c 100644
--- a/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml
+++ b/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -19,7 +19,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_top_text.xml b/container/testdata/doctabs/desktop/layout_top_text.xml
index 7285d2906c..f3f9f24928 100644
--- a/container/testdata/doctabs/desktop/layout_top_text.xml
+++ b/container/testdata/doctabs/desktop/layout_top_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_trailing_icon.xml b/container/testdata/doctabs/desktop/layout_trailing_icon.xml
index c1712fb144..6506343e51 100644
--- a/container/testdata/doctabs/desktop/layout_trailing_icon.xml
+++ b/container/testdata/doctabs/desktop/layout_trailing_icon.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml b/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml
index e061456519..76786e0904 100644
--- a/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml
+++ b/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -19,7 +19,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/layout_trailing_text.xml b/container/testdata/doctabs/desktop/layout_trailing_text.xml
index d11a178f28..1b6ded4b7a 100644
--- a/container/testdata/doctabs/desktop/layout_trailing_text.xml
+++ b/container/testdata/doctabs/desktop/layout_trailing_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -18,7 +18,7 @@
-
+
diff --git a/container/testdata/doctabs/desktop/single_custom_theme.png b/container/testdata/doctabs/desktop/single_custom_theme.png
index c648b09724..85a5622b52 100644
Binary files a/container/testdata/doctabs/desktop/single_custom_theme.png and b/container/testdata/doctabs/desktop/single_custom_theme.png differ
diff --git a/container/testdata/doctabs/desktop/single_initial.png b/container/testdata/doctabs/desktop/single_initial.png
index 1e711173c1..9e270e811e 100644
Binary files a/container/testdata/doctabs/desktop/single_initial.png and b/container/testdata/doctabs/desktop/single_initial.png differ
diff --git a/container/testdata/doctabs/desktop/tab_location_bottom.xml b/container/testdata/doctabs/desktop/tab_location_bottom.xml
index 9528917c0f..5ea9950217 100644
--- a/container/testdata/doctabs/desktop/tab_location_bottom.xml
+++ b/container/testdata/doctabs/desktop/tab_location_bottom.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -32,7 +32,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/tab_location_leading.xml b/container/testdata/doctabs/desktop/tab_location_leading.xml
index 025c032505..2f2cd168f1 100644
--- a/container/testdata/doctabs/desktop/tab_location_leading.xml
+++ b/container/testdata/doctabs/desktop/tab_location_leading.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -32,7 +32,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/tab_location_top.xml b/container/testdata/doctabs/desktop/tab_location_top.xml
index 287f6e4487..d8472f5811 100644
--- a/container/testdata/doctabs/desktop/tab_location_top.xml
+++ b/container/testdata/doctabs/desktop/tab_location_top.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -32,7 +32,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/tab_location_trailing.xml b/container/testdata/doctabs/desktop/tab_location_trailing.xml
index 41eea673ae..1566a8b692 100644
--- a/container/testdata/doctabs/desktop/tab_location_trailing.xml
+++ b/container/testdata/doctabs/desktop/tab_location_trailing.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -32,7 +32,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/tapped_all_tabs.xml b/container/testdata/doctabs/desktop/tapped_all_tabs.xml
index 6a08110620..cae9fc6de2 100644
--- a/container/testdata/doctabs/desktop/tapped_all_tabs.xml
+++ b/container/testdata/doctabs/desktop/tapped_all_tabs.xml
@@ -14,7 +14,7 @@
Test3
- Another
+ Another
@@ -40,7 +40,7 @@
-
+
Another Tab
diff --git a/container/testdata/doctabs/desktop/tapped_create_tab.xml b/container/testdata/doctabs/desktop/tapped_create_tab.xml
index 52e1e27c1e..93e016e104 100644
--- a/container/testdata/doctabs/desktop/tapped_create_tab.xml
+++ b/container/testdata/doctabs/desktop/tapped_create_tab.xml
@@ -14,7 +14,7 @@
Test3
- Another
+ Another
@@ -40,7 +40,7 @@
-
+
Another Tab
diff --git a/container/testdata/doctabs/desktop/tapped_first_selected.xml b/container/testdata/doctabs/desktop/tapped_first_selected.xml
index f0e5a75f1f..16f4d85f55 100644
--- a/container/testdata/doctabs/desktop/tapped_first_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_first_selected.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
Test2
@@ -37,7 +37,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/desktop/tapped_second_selected.xml b/container/testdata/doctabs/desktop/tapped_second_selected.xml
index 506c13d2a7..3f208dd8e3 100644
--- a/container/testdata/doctabs/desktop/tapped_second_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_second_selected.xml
@@ -8,7 +8,7 @@
Test1
- Test2
+ Test2
Test3
@@ -37,7 +37,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/desktop/tapped_third_selected.xml b/container/testdata/doctabs/desktop/tapped_third_selected.xml
index ce79f149c0..df3abdce9a 100644
--- a/container/testdata/doctabs/desktop/tapped_third_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_third_selected.xml
@@ -11,7 +11,7 @@
Test2
- Test3
+ Test3
@@ -37,7 +37,7 @@
-
+
Text 3
diff --git a/container/testdata/doctabs/mobile/change_content_change_hidden.xml b/container/testdata/doctabs/mobile/change_content_change_hidden.xml
index 2ab38f3e1b..e047c38359 100644
--- a/container/testdata/doctabs/mobile/change_content_change_hidden.xml
+++ b/container/testdata/doctabs/mobile/change_content_change_hidden.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -35,7 +35,7 @@
-
+
Text3
diff --git a/container/testdata/doctabs/mobile/change_content_change_visible.xml b/container/testdata/doctabs/mobile/change_content_change_visible.xml
index 2ab38f3e1b..e047c38359 100644
--- a/container/testdata/doctabs/mobile/change_content_change_visible.xml
+++ b/container/testdata/doctabs/mobile/change_content_change_visible.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -35,7 +35,7 @@
-
+
Text3
diff --git a/container/testdata/doctabs/mobile/change_content_initial.xml b/container/testdata/doctabs/mobile/change_content_initial.xml
index 79cc6b3893..c1f8820c9b 100644
--- a/container/testdata/doctabs/mobile/change_content_initial.xml
+++ b/container/testdata/doctabs/mobile/change_content_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -35,7 +35,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_icon_change_selected.xml b/container/testdata/doctabs/mobile/change_icon_change_selected.xml
index 2c2b150796..36317b7d42 100644
--- a/container/testdata/doctabs/mobile/change_icon_change_selected.xml
+++ b/container/testdata/doctabs/mobile/change_icon_change_selected.xml
@@ -27,7 +27,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
index 918e54e500..1718142b5e 100644
--- a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
+++ b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
@@ -27,7 +27,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_icon_initial.xml b/container/testdata/doctabs/mobile/change_icon_initial.xml
index bd033ee873..fce46a1908 100644
--- a/container/testdata/doctabs/mobile/change_icon_initial.xml
+++ b/container/testdata/doctabs/mobile/change_icon_initial.xml
@@ -27,7 +27,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_label_change_selected.xml b/container/testdata/doctabs/mobile/change_label_change_selected.xml
index 84268772fb..7dae500c0c 100644
--- a/container/testdata/doctabs/mobile/change_label_change_selected.xml
+++ b/container/testdata/doctabs/mobile/change_label_change_selected.xml
@@ -5,7 +5,7 @@
- New 1
+ New 1
@@ -35,7 +35,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_label_change_unselected.xml b/container/testdata/doctabs/mobile/change_label_change_unselected.xml
index 1fd574db41..9a69ce19f6 100644
--- a/container/testdata/doctabs/mobile/change_label_change_unselected.xml
+++ b/container/testdata/doctabs/mobile/change_label_change_unselected.xml
@@ -5,7 +5,7 @@
- New 1
+ New 1
@@ -35,7 +35,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/change_label_initial.xml b/container/testdata/doctabs/mobile/change_label_initial.xml
index 79cc6b3893..c1f8820c9b 100644
--- a/container/testdata/doctabs/mobile/change_label_initial.xml
+++ b/container/testdata/doctabs/mobile/change_label_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -35,7 +35,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/dynamic_appended.xml b/container/testdata/doctabs/mobile/dynamic_appended.xml
index 630bb963ec..d468edd529 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -27,7 +27,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
index db7dc50539..f775eb42eb 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
@@ -5,7 +5,7 @@
- Test2
+ Test2
@@ -21,7 +21,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
index b0c1bd1cb3..67923a22bf 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
@@ -5,7 +5,7 @@
- Test2
+ Test2
@@ -47,7 +47,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/mobile/dynamic_initial.xml b/container/testdata/doctabs/mobile/dynamic_initial.xml
index 3ac0160fb0..aa75533209 100644
--- a/container/testdata/doctabs/mobile/dynamic_initial.xml
+++ b/container/testdata/doctabs/mobile/dynamic_initial.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -21,7 +21,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
index 47e239d34d..99bc845de0 100644
--- a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
+++ b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
@@ -5,7 +5,7 @@
- Test6
+ Test6
@@ -33,7 +33,7 @@
-
+
Text 6
diff --git a/container/testdata/doctabs/mobile/hover_none.xml b/container/testdata/doctabs/mobile/hover_none.xml
index 79cc6b3893..c1f8820c9b 100644
--- a/container/testdata/doctabs/mobile/hover_none.xml
+++ b/container/testdata/doctabs/mobile/hover_none.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -35,7 +35,7 @@
-
+
Text1
diff --git a/container/testdata/doctabs/mobile/layout_bottom_ico.xml b/container/testdata/doctabs/mobile/layout_bottom_ico.xml
index 9f40d8cfc2..45f45d047f 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_ico.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_ico.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
index 97c3dbf02c..fad11f43d5 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -22,7 +22,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/layout_bottom_text.xml b/container/testdata/doctabs/mobile/layout_bottom_text.xml
index 001c39c61e..acdceb0ad7 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_text.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -21,7 +21,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/layout_top_icon.xml b/container/testdata/doctabs/mobile/layout_top_icon.xml
index 202ee560cf..58dfab0028 100644
--- a/container/testdata/doctabs/mobile/layout_top_icon.xml
+++ b/container/testdata/doctabs/mobile/layout_top_icon.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
index a21794d559..4476d962a9 100644
--- a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
+++ b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
@@ -5,7 +5,7 @@
- Text1
+ Text1
@@ -22,7 +22,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/layout_top_text.xml b/container/testdata/doctabs/mobile/layout_top_text.xml
index 434ab1817f..4cc2504e64 100644
--- a/container/testdata/doctabs/mobile/layout_top_text.xml
+++ b/container/testdata/doctabs/mobile/layout_top_text.xml
@@ -5,7 +5,7 @@
- Text2
+ Text2
@@ -21,7 +21,7 @@
-
+
diff --git a/container/testdata/doctabs/mobile/tab_location_bottom.xml b/container/testdata/doctabs/mobile/tab_location_bottom.xml
index 4af0c0e96a..e43698326b 100644
--- a/container/testdata/doctabs/mobile/tab_location_bottom.xml
+++ b/container/testdata/doctabs/mobile/tab_location_bottom.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -41,7 +41,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/mobile/tab_location_top.xml b/container/testdata/doctabs/mobile/tab_location_top.xml
index a18ea3a8fb..bc058613f0 100644
--- a/container/testdata/doctabs/mobile/tab_location_top.xml
+++ b/container/testdata/doctabs/mobile/tab_location_top.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -41,7 +41,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml
index b025770675..900edee22f 100644
--- a/container/testdata/doctabs/mobile/tapped_all_tabs.xml
+++ b/container/testdata/doctabs/mobile/tapped_all_tabs.xml
@@ -23,7 +23,7 @@
- Another
+ Another
@@ -52,7 +52,7 @@
-
+
Another Tab
diff --git a/container/testdata/doctabs/mobile/tapped_create_tab.xml b/container/testdata/doctabs/mobile/tapped_create_tab.xml
index c1661f1a5b..bad4a905b3 100644
--- a/container/testdata/doctabs/mobile/tapped_create_tab.xml
+++ b/container/testdata/doctabs/mobile/tapped_create_tab.xml
@@ -23,7 +23,7 @@
- Another
+ Another
@@ -52,7 +52,7 @@
-
+
Another Tab
diff --git a/container/testdata/doctabs/mobile/tapped_first_selected.xml b/container/testdata/doctabs/mobile/tapped_first_selected.xml
index 596f0de910..b8c560eb7d 100644
--- a/container/testdata/doctabs/mobile/tapped_first_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_first_selected.xml
@@ -5,7 +5,7 @@
- Test1
+ Test1
@@ -38,7 +38,7 @@
-
+
Text 1
diff --git a/container/testdata/doctabs/mobile/tapped_second_selected.xml b/container/testdata/doctabs/mobile/tapped_second_selected.xml
index 6ec1d9d20e..27c83a96e1 100644
--- a/container/testdata/doctabs/mobile/tapped_second_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_second_selected.xml
@@ -11,7 +11,7 @@
- Test2
+ Test2
@@ -38,7 +38,7 @@
-
+
Text 2
diff --git a/container/testdata/doctabs/mobile/tapped_third_selected.xml b/container/testdata/doctabs/mobile/tapped_third_selected.xml
index 02c7c6bf7d..1a40e934fd 100644
--- a/container/testdata/doctabs/mobile/tapped_third_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_third_selected.xml
@@ -17,7 +17,7 @@
- Test3
+ Test3
@@ -38,7 +38,7 @@
-
+
Text 3
diff --git a/container/testdata/doctabs/mobile/theme_default.png b/container/testdata/doctabs/mobile/theme_default.png
index 69b644200f..92952c21de 100644
Binary files a/container/testdata/doctabs/mobile/theme_default.png and b/container/testdata/doctabs/mobile/theme_default.png differ
diff --git a/container/testdata/doctabs/mobile/theme_ugly.png b/container/testdata/doctabs/mobile/theme_ugly.png
index c648b09724..85a5622b52 100644
Binary files a/container/testdata/doctabs/mobile/theme_ugly.png and b/container/testdata/doctabs/mobile/theme_ugly.png differ
diff --git a/dialog/testdata/form/hint_invalid.png b/dialog/testdata/form/hint_invalid.png
index b330ae4462..512d0156a1 100644
Binary files a/dialog/testdata/form/hint_invalid.png and b/dialog/testdata/form/hint_invalid.png differ
diff --git a/driver/software/testdata/canvas.png b/driver/software/testdata/canvas.png
index 51ab1a034e..53f45f2fc5 100644
Binary files a/driver/software/testdata/canvas.png and b/driver/software/testdata/canvas.png differ
diff --git a/driver/software/testdata/canvas_mobile.png b/driver/software/testdata/canvas_mobile.png
index 707db69e13..6cd985caa9 100644
Binary files a/driver/software/testdata/canvas_mobile.png and b/driver/software/testdata/canvas_mobile.png differ
diff --git a/driver/software/testdata/entry_focus.png b/driver/software/testdata/entry_focus.png
index 1eaca71a7c..6bf2ac7dbe 100644
Binary files a/driver/software/testdata/entry_focus.png and b/driver/software/testdata/entry_focus.png differ
diff --git a/test/markup_renderer.go b/test/markup_renderer.go
index 882380651b..eda7bc21ae 100644
--- a/test/markup_renderer.go
+++ b/test/markup_renderer.go
@@ -391,6 +391,7 @@ func knownColor(c color.Color) string {
nrgbaColor(theme.Color(theme.ColorNameDisabledButton)): "disabled button",
nrgbaColor(theme.Color(theme.ColorNameDisabled)): "disabled",
nrgbaColor(theme.Color(theme.ColorNameError)): "error",
+ nrgbaColor(theme.Color(theme.ColorNameErrorOnBackground)): "errorOnBackground",
nrgbaColor(theme.Color(theme.ColorNameFocus)): "focus",
nrgbaColor(theme.Color(theme.ColorNameForeground)): "foreground",
nrgbaColor(theme.Color(theme.ColorNameForegroundOnError)): "foregroundOnError",
@@ -407,12 +408,15 @@ func knownColor(c color.Color) string {
nrgbaColor(theme.Color(theme.ColorNamePlaceHolder)): "placeholder",
nrgbaColor(theme.Color(theme.ColorNamePressed)): "pressed",
nrgbaColor(theme.Color(theme.ColorNamePrimary)): "primary",
+ nrgbaColor(theme.Color(theme.ColorNamePrimaryOnBackground)): "primaryOnBackground",
nrgbaColor(theme.Color(theme.ColorNameScrollBar)): "scrollbar",
nrgbaColor(theme.Color(theme.ColorNameSelection)): "selection",
nrgbaColor(theme.Color(theme.ColorNameSeparator)): "separator",
nrgbaColor(theme.Color(theme.ColorNameSuccess)): "success",
+ nrgbaColor(theme.Color(theme.ColorNameSuccessOnBackground)): "successOnBackground",
nrgbaColor(theme.Color(theme.ColorNameShadow)): "shadow",
nrgbaColor(theme.Color(theme.ColorNameWarning)): "warning",
+ nrgbaColor(theme.Color(theme.ColorNameWarningOnBackground)): "warningOnBackground",
}[nrgbaColor(c)]
}
diff --git a/test/theme.go b/test/theme.go
index bd5b707b0c..01bd11e1d4 100644
--- a/test/theme.go
+++ b/test/theme.go
@@ -20,6 +20,7 @@ var knownColorNames = []fyne.ThemeColorName{
theme.ColorNameDisabled,
theme.ColorNameDisabledButton,
theme.ColorNameError,
+ theme.ColorNameErrorOnBackground,
theme.ColorNameFocus,
theme.ColorNameForeground,
theme.ColorNameForegroundOnError,
@@ -36,12 +37,15 @@ var knownColorNames = []fyne.ThemeColorName{
theme.ColorNamePlaceHolder,
theme.ColorNamePressed,
theme.ColorNamePrimary,
+ theme.ColorNamePrimaryOnBackground,
theme.ColorNameScrollBar,
theme.ColorNameSelection,
theme.ColorNameSeparator,
theme.ColorNameShadow,
theme.ColorNameSuccess,
+ theme.ColorNameSuccessOnBackground,
theme.ColorNameWarning,
+ theme.ColorNameWarningOnBackground,
}
// AssertAllColorNamesDefined asserts that all known color names are defined for the given theme.
@@ -94,6 +98,7 @@ func NewTheme() fyne.Theme {
theme.ColorNameDisabled: gray(20),
theme.ColorNameDisabledButton: gray(230),
theme.ColorNameError: blue(255),
+ theme.ColorNameErrorOnBackground: blue(230),
theme.ColorNameFocus: red(66),
theme.ColorNameForeground: gray(255),
theme.ColorNameForegroundOnError: red(210),
@@ -110,12 +115,15 @@ func NewTheme() fyne.Theme {
theme.ColorNamePlaceHolder: blue(200),
theme.ColorNamePressed: blue(250),
theme.ColorNamePrimary: green(255),
+ theme.ColorNamePrimaryOnBackground: green(230),
theme.ColorNameScrollBar: blue(220),
theme.ColorNameSelection: red(55),
theme.ColorNameSeparator: gray(30),
theme.ColorNameShadow: blue(150),
theme.ColorNameSuccess: green(150),
+ theme.ColorNameSuccessOnBackground: green(120),
theme.ColorNameWarning: red(100),
+ theme.ColorNameWarningOnBackground: red(120),
},
fonts: map[fyne.TextStyle]fyne.Resource{
{}: theme.DefaultTextBoldFont(),
@@ -156,6 +164,7 @@ func Theme() fyne.Theme {
theme.ColorNameDisabled: color.NRGBA{R: 0x88, G: 0x88, B: 0x88, A: 0xff},
theme.ColorNameDisabledButton: color.NRGBA{R: 0x22, G: 0x22, B: 0x22, A: 0xff},
theme.ColorNameError: color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff},
+ theme.ColorNameErrorOnBackground: color.NRGBA{R: 0xff, G: 0x40, B: 0x40, A: 0xff},
theme.ColorNameFocus: color.NRGBA{R: 0x78, G: 0x3a, B: 0x3a, A: 0xff},
theme.ColorNameForeground: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff},
theme.ColorNameForegroundOnError: color.NRGBA{R: 0x08, G: 0x0a, B: 0x0f, A: 0xff},
@@ -172,12 +181,15 @@ func Theme() fyne.Theme {
theme.ColorNamePlaceHolder: color.NRGBA{R: 0xaa, G: 0xaa, B: 0xaa, A: 0xff},
theme.ColorNamePressed: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x33},
theme.ColorNamePrimary: color.NRGBA{R: 0xff, G: 0xc0, B: 0x80, A: 0xff},
+ theme.ColorNamePrimaryOnBackground: color.NRGBA{R: 0xf0, G: 0xb0, B: 0x70, A: 0xff},
theme.ColorNameScrollBar: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xaa},
theme.ColorNameSelection: color.NRGBA{R: 0x78, G: 0x3a, B: 0x3a, A: 0x99},
theme.ColorNameSeparator: color.NRGBA{R: 0x90, G: 0x90, B: 0x90, A: 0xff},
theme.ColorNameShadow: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x88},
theme.ColorNameSuccess: color.NRGBA{R: 0x00, G: 0x99, B: 0x00, A: 0xff},
+ theme.ColorNameSuccessOnBackground: color.NRGBA{R: 0x40, G: 0xff, B: 0x40, A: 0xff},
theme.ColorNameWarning: color.NRGBA{R: 0xee, G: 0xee, B: 0x00, A: 0xff},
+ theme.ColorNameWarningOnBackground: color.NRGBA{R: 0xff, G: 0xff, B: 0x00, A: 0xff},
},
fonts: map[fyne.TextStyle]fyne.Resource{
{}: theme.DefaultTextFont(),
diff --git a/theme/color.go b/theme/color.go
index 484f686738..527d58ece5 100644
--- a/theme/color.go
+++ b/theme/color.go
@@ -67,6 +67,11 @@ const (
// Since: 2.0
ColorNameError fyne.ThemeColorName = "error"
+ // ColorNameErrorOnBackground is the name of theme lookup for the error color with contrast to the background.
+ //
+ // Since: 2.5
+ ColorNameErrorOnBackground fyne.ThemeColorName = "errorOnBackground"
+
// ColorNameFocus is the name of theme lookup for focus color.
//
// Since: 2.0
@@ -147,6 +152,11 @@ const (
// Since: 2.0
ColorNamePrimary fyne.ThemeColorName = "primary"
+ // ColorNamePrimaryOnBackground is the name of theme lookup for the primary color with contrast to the background.
+ //
+ // Since: 2.5
+ ColorNamePrimaryOnBackground fyne.ThemeColorName = "primaryOnBackground"
+
// ColorNameScrollBar is the name of theme lookup for scrollbar color.
//
// Since: 2.0
@@ -172,74 +182,106 @@ const (
// Since: 2.3
ColorNameSuccess fyne.ThemeColorName = "success"
+ // ColorNameSuccessOnBackground is the name of theme lookup for the primary color with contrast to the background.
+ //
+ // Since: 2.5
+ ColorNameSuccessOnBackground fyne.ThemeColorName = "successOnBackground"
+
// ColorNameWarning is the name of theme lookup for warning color.
//
// Since: 2.3
ColorNameWarning fyne.ThemeColorName = "warning"
+
+ // ColorNameWarningOnBackground is the name of theme lookup for the primary color with contrast to the background.
+ //
+ // Since: 2.5
+ ColorNameWarningOnBackground fyne.ThemeColorName = "warningOnBackground"
)
var (
- colorDarkBackground = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
- colorDarkButton = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
- colorDarkDisabled = color.NRGBA{R: 0x39, G: 0x39, B: 0x3a, A: 0xff}
- colorDarkDisabledButton = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
- colorDarkError = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
- colorDarkForeground = color.NRGBA{R: 0xf3, G: 0xf3, B: 0xf3, A: 0xff}
- colorDarkForegroundOnError = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
- colorDarkForegroundOnSuccess = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
- colorDarkForegroundOnWarning = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
- colorDarkHeaderBackground = color.NRGBA{R: 0x1b, G: 0x1b, B: 0x1b, A: 0xff}
- colorDarkHover = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x0f}
- colorDarkInputBackground = color.NRGBA{R: 0x20, G: 0x20, B: 0x23, A: 0xff}
- colorDarkInputBorder = color.NRGBA{R: 0x39, G: 0x39, B: 0x3a, A: 0xff}
- colorDarkMenuBackground = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
- colorDarkOverlayBackground = color.NRGBA{R: 0x18, G: 0x1d, B: 0x25, A: 0xff}
- colorDarkPlaceholder = color.NRGBA{R: 0xb2, G: 0xb2, B: 0xb2, A: 0xff}
- colorDarkPressed = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x66}
- colorDarkScrollBar = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x99}
- colorDarkSeparator = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xff}
- colorDarkShadow = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x66}
- colorDarkSuccess = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
- colorDarkWarning = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
-
- colorLightBackground = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
- colorLightButton = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
- colorLightDisabled = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
- colorLightDisabledButton = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
- colorLightError = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
- colorLightFocusBlue = color.NRGBA{R: 0x00, G: 0x6c, B: 0xff, A: 0x2a}
- colorLightFocusBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0x7f}
- colorLightFocusGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0x7f}
- colorLightFocusGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0x7f}
- colorLightFocusOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0x7f}
- colorLightFocusPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0x7f}
- colorLightFocusRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0x7f}
- colorLightFocusYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0x7f}
- colorLightForeground = color.NRGBA{R: 0x56, G: 0x56, B: 0x56, A: 0xff}
- colorLightForegroundOnError = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
- colorLightForegroundOnSuccess = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
- colorLightForegroundOnWarning = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
- colorLightHeaderBackground = color.NRGBA{R: 0xf9, G: 0xf9, B: 0xf9, A: 0xff}
- colorLightHover = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x0f}
- colorLightInputBackground = color.NRGBA{R: 0xf3, G: 0xf3, B: 0xf3, A: 0xff}
- colorLightInputBorder = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
- colorLightMenuBackground = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
- colorLightOverlayBackground = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
- colorLightPlaceholder = color.NRGBA{R: 0x88, G: 0x88, B: 0x88, A: 0xff}
- colorLightPressed = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x19}
- colorLightScrollBar = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x99}
- colorLightSelectionBlue = color.NRGBA{R: 0x00, G: 0x6c, B: 0xff, A: 0x40}
- colorLightSelectionBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0x3f}
- colorLightSelectionGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0x3f}
- colorLightSelectionGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0x3f}
- colorLightSelectionOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0x3f}
- colorLightSelectionPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0x3f}
- colorLightSelectionRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0x3f}
- colorLightSelectionYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0x3f}
- colorLightSeparator = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
- colorLightShadow = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x33}
- colorLightSuccess = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
- colorLightWarning = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+ colorDarkBackground = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
+ colorDarkButton = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
+ colorDarkDisabled = color.NRGBA{R: 0x39, G: 0x39, B: 0x3a, A: 0xff}
+ colorDarkDisabledButton = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
+ colorDarkError = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorDarkErrorOnBackground = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorDarkForeground = color.NRGBA{R: 0xf3, G: 0xf3, B: 0xf3, A: 0xff}
+ colorDarkForegroundOnError = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
+ colorDarkForegroundOnSuccess = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
+ colorDarkForegroundOnWarning = color.NRGBA{R: 0x17, G: 0x17, B: 0x18, A: 0xff}
+ colorDarkHeaderBackground = color.NRGBA{R: 0x1b, G: 0x1b, B: 0x1b, A: 0xff}
+ colorDarkHover = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x0f}
+ colorDarkInputBackground = color.NRGBA{R: 0x20, G: 0x20, B: 0x23, A: 0xff}
+ colorDarkInputBorder = color.NRGBA{R: 0x39, G: 0x39, B: 0x3a, A: 0xff}
+ colorDarkMenuBackground = color.NRGBA{R: 0x28, G: 0x29, B: 0x2e, A: 0xff}
+ colorDarkOverlayBackground = color.NRGBA{R: 0x18, G: 0x1d, B: 0x25, A: 0xff}
+ colorDarkPlaceholder = color.NRGBA{R: 0xb2, G: 0xb2, B: 0xb2, A: 0xff}
+ colorDarkPressed = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x66}
+ colorDarkPrimaryOnBackgroundBlue = color.NRGBA{R: 0x29, G: 0x6f, B: 0xf6, A: 0xff}
+ colorDarkPrimaryOnBackgroundBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0xff}
+ colorDarkPrimaryOnBackgroundGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0xff}
+ colorDarkPrimaryOnBackgroundGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0xff}
+ colorDarkPrimaryOnBackgroundOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+ colorDarkPrimaryOnBackgroundPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0xff}
+ colorDarkPrimaryOnBackgroundRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorDarkPrimaryOnBackgroundYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0xff}
+ colorDarkScrollBar = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x99}
+ colorDarkSeparator = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xff}
+ colorDarkShadow = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x66}
+ colorDarkSuccess = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
+ colorDarkSuccessOnBackground = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
+ colorDarkWarning = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+ colorDarkWarningOnBackground = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+
+ colorLightBackground = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+ colorLightButton = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
+ colorLightDisabled = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
+ colorLightDisabledButton = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
+ colorLightError = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorLightErrorOnBackground = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorLightFocusBlue = color.NRGBA{R: 0x00, G: 0x6c, B: 0xff, A: 0x2a}
+ colorLightFocusBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0x7f}
+ colorLightFocusGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0x7f}
+ colorLightFocusGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0x7f}
+ colorLightFocusOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0x7f}
+ colorLightFocusPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0x7f}
+ colorLightFocusRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0x7f}
+ colorLightFocusYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0x7f}
+ colorLightForeground = color.NRGBA{R: 0x56, G: 0x56, B: 0x56, A: 0xff}
+ colorLightForegroundOnError = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+ colorLightForegroundOnSuccess = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+ colorLightForegroundOnWarning = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+ colorLightHeaderBackground = color.NRGBA{R: 0xf9, G: 0xf9, B: 0xf9, A: 0xff}
+ colorLightHover = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x0f}
+ colorLightInputBackground = color.NRGBA{R: 0xf3, G: 0xf3, B: 0xf3, A: 0xff}
+ colorLightInputBorder = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
+ colorLightMenuBackground = color.NRGBA{R: 0xf5, G: 0xf5, B: 0xf5, A: 0xff}
+ colorLightOverlayBackground = color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+ colorLightPlaceholder = color.NRGBA{R: 0x88, G: 0x88, B: 0x88, A: 0xff}
+ colorLightPressed = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x19}
+ colorLightPrimaryOnBackgroundBlue = color.NRGBA{R: 0x29, G: 0x6f, B: 0xf6, A: 0xff}
+ colorLightPrimaryOnBackgroundBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0xff}
+ colorLightPrimaryOnBackgroundGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0xff}
+ colorLightPrimaryOnBackgroundGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0xff}
+ colorLightPrimaryOnBackgroundOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+ colorLightPrimaryOnBackgroundPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0xff}
+ colorLightPrimaryOnBackgroundRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0xff}
+ colorLightPrimaryOnBackgroundYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0xff}
+ colorLightScrollBar = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x99}
+ colorLightSelectionBlue = color.NRGBA{R: 0x00, G: 0x6c, B: 0xff, A: 0x40}
+ colorLightSelectionBrown = color.NRGBA{R: 0x79, G: 0x55, B: 0x48, A: 0x3f}
+ colorLightSelectionGray = color.NRGBA{R: 0x9e, G: 0x9e, B: 0x9e, A: 0x3f}
+ colorLightSelectionGreen = color.NRGBA{R: 0x8b, G: 0xc3, B: 0x4a, A: 0x3f}
+ colorLightSelectionOrange = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0x3f}
+ colorLightSelectionPurple = color.NRGBA{R: 0x9c, G: 0x27, B: 0xb0, A: 0x3f}
+ colorLightSelectionRed = color.NRGBA{R: 0xf4, G: 0x43, B: 0x36, A: 0x3f}
+ colorLightSelectionYellow = color.NRGBA{R: 0xff, G: 0xeb, B: 0x3b, A: 0x3f}
+ colorLightSeparator = color.NRGBA{R: 0xe3, G: 0xe3, B: 0xe3, A: 0xff}
+ colorLightShadow = color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x33}
+ colorLightSuccess = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
+ colorLightSuccessOnBackground = color.NRGBA{R: 0x43, G: 0xf4, B: 0x36, A: 0xff}
+ colorLightWarning = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
+ colorLightWarningOnBackground = color.NRGBA{R: 0xff, G: 0x98, B: 0x00, A: 0xff}
)
// BackgroundColor returns the theme's background color.
diff --git a/theme/icons.go b/theme/icons.go
index 2082c60cb9..359e70ec3b 100644
--- a/theme/icons.go
+++ b/theme/icons.go
@@ -661,7 +661,7 @@ func NewColoredResource(src fyne.Resource, name fyne.ThemeColorName) *ThemedReso
func NewSuccessThemedResource(src fyne.Resource) *ThemedResource {
return &ThemedResource{
source: src,
- ColorName: ColorNameSuccess,
+ ColorName: ColorNameSuccessOnBackground,
}
}
@@ -679,7 +679,7 @@ func NewThemedResource(src fyne.Resource) *ThemedResource {
func NewWarningThemedResource(src fyne.Resource) *ThemedResource {
return &ThemedResource{
source: src,
- ColorName: ColorNameWarning,
+ ColorName: ColorNameWarningOnBackground,
}
}
@@ -758,12 +758,12 @@ func NewErrorThemedResource(orig fyne.Resource) *ErrorThemedResource {
// Name returns the underlying resource name (used for caching).
func (res *ErrorThemedResource) Name() string {
- return "error_" + unwrapResource(res.source).Name()
+ return "errorOnBackground_" + unwrapResource(res.source).Name()
}
// Content returns the underlying content of the resource adapted to the current background color.
func (res *ErrorThemedResource) Content() []byte {
- return svg.Colorize(unwrapResource(res.source).Content(), Color(ColorNameError))
+ return svg.Colorize(unwrapResource(res.source).Content(), Color(ColorNameErrorOnBackground))
}
// Original returns the underlying resource that this error themed resource was adapted from
@@ -785,12 +785,12 @@ func NewPrimaryThemedResource(orig fyne.Resource) *PrimaryThemedResource {
// Name returns the underlying resource name (used for caching).
func (res *PrimaryThemedResource) Name() string {
- return "primary_" + unwrapResource(res.source).Name()
+ return "primaryOnBackground_" + unwrapResource(res.source).Name()
}
// Content returns the underlying content of the resource adapted to the current background color.
func (res *PrimaryThemedResource) Content() []byte {
- return svg.Colorize(unwrapResource(res.source).Content(), Color(ColorNamePrimary))
+ return svg.Colorize(unwrapResource(res.source).Content(), Color(ColorNamePrimaryOnBackground))
}
// Original returns the underlying resource that this primary themed resource was adapted from
diff --git a/theme/icons_test.go b/theme/icons_test.go
index 2bf1ed5aff..da8502d6af 100644
--- a/theme/icons_test.go
+++ b/theme/icons_test.go
@@ -64,13 +64,13 @@ func TestNewThemedResource_StaticResourceSupport(t *testing.T) {
func TestNewColoredResource(t *testing.T) {
fyne.CurrentApp().Settings().SetTheme(theme.DarkTheme())
source := helperNewStaticResource()
- custom := theme.NewColoredResource(source, theme.ColorNameSuccess)
+ custom := theme.NewColoredResource(source, theme.ColorNameSuccessOnBackground)
- assert.Equal(t, theme.ColorNameSuccess, custom.ColorName)
- assert.Equal(t, custom.Name(), fmt.Sprintf("success_%v", source.Name()))
+ assert.Equal(t, theme.ColorNameSuccessOnBackground, custom.ColorName)
+ assert.Equal(t, custom.Name(), fmt.Sprintf("successOnBackground_%v", source.Name()))
- custom = theme.NewColoredResource(source, theme.ColorNamePrimary)
- assert.Equal(t, custom.Name(), fmt.Sprintf("primary_%v", source.Name()))
+ custom = theme.NewColoredResource(source, theme.ColorNamePrimaryOnBackground)
+ assert.Equal(t, custom.Name(), fmt.Sprintf("primaryOnBackground_%v", source.Name()))
}
func TestNewDisabledResource(t *testing.T) {
@@ -134,34 +134,34 @@ func TestThemedResource_Error(t *testing.T) {
fyne.CurrentApp().Settings().SetTheme(theme.DarkTheme())
source := helperNewStaticResource()
custom := theme.NewThemedResource(source)
- custom.ColorName = theme.ColorNameError
+ custom.ColorName = theme.ColorNameErrorOnBackground
- assert.Equal(t, custom.Name(), fmt.Sprintf("error_%v", source.Name()))
+ assert.Equal(t, fmt.Sprintf("errorOnBackground_%v", source.Name()), custom.Name())
custom2 := theme.NewErrorThemedResource(source)
- assert.Equal(t, custom2.Name(), fmt.Sprintf("error_%v", source.Name()))
+ assert.Equal(t, fmt.Sprintf("errorOnBackground_%v", source.Name()), custom2.Name())
}
func TestThemedResource_Success(t *testing.T) {
fyne.CurrentApp().Settings().SetTheme(theme.DarkTheme())
source := helperNewStaticResource()
custom := theme.NewThemedResource(source)
- custom.ColorName = theme.ColorNameSuccess
+ custom.ColorName = theme.ColorNameSuccessOnBackground
- assert.Equal(t, custom.Name(), fmt.Sprintf("success_%v", source.Name()))
+ assert.Equal(t, custom.Name(), fmt.Sprintf("successOnBackground_%v", source.Name()))
custom = theme.NewSuccessThemedResource(source)
- assert.Equal(t, custom.Name(), fmt.Sprintf("success_%v", source.Name()))
+ assert.Equal(t, custom.Name(), fmt.Sprintf("successOnBackground_%v", source.Name()))
}
func TestThemedResource_Warning(t *testing.T) {
fyne.CurrentApp().Settings().SetTheme(theme.DarkTheme())
source := helperNewStaticResource()
custom := theme.NewThemedResource(source)
- custom.ColorName = theme.ColorNameWarning
+ custom.ColorName = theme.ColorNameWarningOnBackground
- assert.Equal(t, custom.Name(), fmt.Sprintf("warning_%v", source.Name()))
+ assert.Equal(t, custom.Name(), fmt.Sprintf("warningOnBackground_%v", source.Name()))
custom = theme.NewWarningThemedResource(source)
- assert.Equal(t, custom.Name(), fmt.Sprintf("warning_%v", source.Name()))
+ assert.Equal(t, custom.Name(), fmt.Sprintf("warningOnBackground_%v", source.Name()))
}
func TestDisabledResource_Name(t *testing.T) {
diff --git a/theme/theme.go b/theme/theme.go
index 55a5ce04a9..ee4a88282e 100644
--- a/theme/theme.go
+++ b/theme/theme.go
@@ -106,6 +106,8 @@ func (t *builtinTheme) Color(n fyne.ThemeColorName, v fyne.ThemeVariant) color.C
return internaltheme.PrimaryColorNamed(primary)
} else if n == ColorNameForegroundOnPrimary {
return internaltheme.ForegroundOnPrimaryColorNamed(primary)
+ } else if n == ColorNamePrimaryOnBackground {
+ return primaryOnBackgroundColorNamed(primary, v)
} else if n == ColorNameFocus {
return focusColorNamed(primary)
} else if n == ColorNameSelection {
@@ -226,6 +228,8 @@ func darkPaletteColorNamed(name fyne.ThemeColorName) color.Color {
return colorDarkDisabledButton
case ColorNameError:
return colorDarkError
+ case ColorNameErrorOnBackground:
+ return colorDarkErrorOnBackground
case ColorNameForeground:
return colorDarkForeground
case ColorNameForegroundOnError:
@@ -258,8 +262,12 @@ func darkPaletteColorNamed(name fyne.ThemeColorName) color.Color {
return colorDarkShadow
case ColorNameSuccess:
return colorDarkSuccess
+ case ColorNameSuccessOnBackground:
+ return colorDarkSuccessOnBackground
case ColorNameWarning:
return colorDarkWarning
+ case ColorNameWarningOnBackground:
+ return colorDarkWarningOnBackground
}
return color.Transparent
@@ -300,6 +308,8 @@ func lightPaletteColorNamed(name fyne.ThemeColorName) color.Color {
return colorLightDisabledButton
case ColorNameError:
return colorLightError
+ case ColorNameErrorOnBackground:
+ return colorLightErrorOnBackground
case ColorNameForeground:
return colorLightForeground
case ColorNameForegroundOnError:
@@ -332,8 +342,12 @@ func lightPaletteColorNamed(name fyne.ThemeColorName) color.Color {
return colorLightShadow
case ColorNameSuccess:
return colorLightSuccess
+ case ColorNameSuccessOnBackground:
+ return colorLightSuccessOnBackground
case ColorNameWarning:
return colorLightWarning
+ case ColorNameWarningOnBackground:
+ return colorLightWarningOnBackground
}
return color.Transparent
@@ -351,6 +365,52 @@ func loadCustomFont(env, variant string, fallback fyne.Resource) fyne.Resource {
return res
}
+func primaryOnBackgroundColorNamed(name string, variant fyne.ThemeVariant) color.Color {
+ if variant == VariantLight {
+ switch name {
+ case ColorRed:
+ return colorLightPrimaryOnBackgroundRed
+ case ColorOrange:
+ return colorLightPrimaryOnBackgroundOrange
+ case ColorYellow:
+ return colorLightPrimaryOnBackgroundYellow
+ case ColorGreen:
+ return colorLightPrimaryOnBackgroundGreen
+ case ColorPurple:
+ return colorLightPrimaryOnBackgroundPurple
+ case ColorBrown:
+ return colorLightPrimaryOnBackgroundBrown
+ case ColorGray:
+ return colorLightPrimaryOnBackgroundGray
+ }
+
+ // We return the value for ColorBlue for every other value.
+ // There is no need to have it in the switch above.
+ return colorLightPrimaryOnBackgroundBlue
+ }
+
+ switch name {
+ case ColorRed:
+ return colorDarkPrimaryOnBackgroundRed
+ case ColorOrange:
+ return colorDarkPrimaryOnBackgroundOrange
+ case ColorYellow:
+ return colorDarkPrimaryOnBackgroundYellow
+ case ColorGreen:
+ return colorDarkPrimaryOnBackgroundGreen
+ case ColorPurple:
+ return colorDarkPrimaryOnBackgroundPurple
+ case ColorBrown:
+ return colorDarkPrimaryOnBackgroundBrown
+ case ColorGray:
+ return colorDarkPrimaryOnBackgroundGray
+ }
+
+ // We return the value for ColorBlue for every other value.
+ // There is no need to have it in the switch above.
+ return colorDarkPrimaryOnBackgroundBlue
+}
+
func selectionColorNamed(name string) color.NRGBA {
switch name {
case ColorRed:
diff --git a/widget/check.go b/widget/check.go
index 22cf72d465..cd666a9703 100644
--- a/widget/check.go
+++ b/widget/check.go
@@ -352,7 +352,7 @@ func (c *checkRenderer) updateResource(th fyne.Theme) {
if c.check.Checked {
res = theme.NewThemedResource(th.Icon(theme.IconNameCheckButtonChecked))
- res.ColorName = theme.ColorNamePrimary
+ res.ColorName = theme.ColorNamePrimaryOnBackground
bgRes.ColorName = theme.ColorNameBackground
}
if c.check.disabled.Load() {
diff --git a/widget/check_internal_test.go b/widget/check_internal_test.go
index 7b18b835be..03277749ad 100644
--- a/widget/check_internal_test.go
+++ b/widget/check_internal_test.go
@@ -47,7 +47,7 @@ func TestCheck_DisabledWhenChecked(t *testing.T) {
check.SetChecked(true)
render := test.TempWidgetRenderer(t, check).(*checkRenderer)
- assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "primary_"))
+ assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "primaryOnBackground_"))
check.Disable()
assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "disabled_"))
diff --git a/widget/entry.go b/widget/entry.go
index 46bada3c3e..2dae170c1b 100644
--- a/widget/entry.go
+++ b/widget/entry.go
@@ -1853,7 +1853,7 @@ func (r *entryRenderer) Refresh() {
r.box.CornerRadius = th.Size(theme.SizeNameInputRadius)
r.border.CornerRadius = r.box.CornerRadius
if focusedAppearance {
- r.border.StrokeColor = th.Color(theme.ColorNamePrimary, v)
+ r.border.StrokeColor = th.Color(theme.ColorNamePrimaryOnBackground, v)
} else {
if r.entry.Disabled() {
r.border.StrokeColor = th.Color(theme.ColorNameDisabled, v)
@@ -1867,7 +1867,7 @@ func (r *entryRenderer) Refresh() {
if r.entry.Validator != nil {
if !r.entry.focused && !r.entry.Disabled() && r.entry.dirty && r.entry.validationError != nil {
- r.border.StrokeColor = th.Color(theme.ColorNameError, v)
+ r.border.StrokeColor = th.Color(theme.ColorNameErrorOnBackground, v)
}
r.ensureValidationSetup()
r.entry.validationStatus.Refresh()
diff --git a/widget/entry_cursor_anim.go b/widget/entry_cursor_anim.go
index 252d7b28b0..17ed8aec40 100644
--- a/widget/entry_cursor_anim.go
+++ b/widget/entry_cursor_anim.go
@@ -33,7 +33,7 @@ func newEntryCursorAnimation(cursor *canvas.Rectangle) *entryCursorAnimation {
// creates fyne animation
func (a *entryCursorAnimation) createAnim(inverted bool) *fyne.Animation {
- cursorOpaque := theme.Color(theme.ColorNamePrimary)
+ cursorOpaque := theme.Color(theme.ColorNamePrimaryOnBackground)
ri, gi, bi, ai := col.ToNRGBA(cursorOpaque)
r := uint8(ri >> 8)
g := uint8(gi >> 8)
diff --git a/widget/entry_cursor_anim_test.go b/widget/entry_cursor_anim_test.go
index 3c7009d298..bc99046722 100644
--- a/widget/entry_cursor_anim_test.go
+++ b/widget/entry_cursor_anim_test.go
@@ -15,7 +15,7 @@ import (
)
func TestEntryCursorAnim(t *testing.T) {
- cursorOpaque := theme.Color(theme.ColorNamePrimary)
+ cursorOpaque := theme.Color(theme.ColorNamePrimaryOnBackground)
r, g, b, _ := col.ToNRGBA(cursorOpaque)
cursorDim := color.NRGBA{R: uint8(r), G: uint8(g), B: uint8(b), A: 0x16}
diff --git a/widget/form.go b/widget/form.go
index 2aa43ed9ac..347a70ca3c 100644
--- a/widget/form.go
+++ b/widget/form.go
@@ -359,7 +359,7 @@ func (f *Form) updateHelperText(item *FormItem) {
item.helperOutput.Color = th.Color(theme.ColorNamePlaceHolder, v)
} else {
item.helperOutput.Text = item.validationError.Error()
- item.helperOutput.Color = th.Color(theme.ColorNameError, v)
+ item.helperOutput.Color = th.Color(theme.ColorNameErrorOnBackground, v)
}
item.helperOutput.Refresh()
}
diff --git a/widget/label.go b/widget/label.go
index a587137d36..f8ecd069b1 100644
--- a/widget/label.go
+++ b/widget/label.go
@@ -130,13 +130,13 @@ func (l *Label) syncSegments() {
case MediumImportance:
color = theme.ColorNameForeground
case HighImportance:
- color = theme.ColorNamePrimary
+ color = theme.ColorNamePrimaryOnBackground
case DangerImportance:
- color = theme.ColorNameError
+ color = theme.ColorNameErrorOnBackground
case WarningImportance:
- color = theme.ColorNameWarning
+ color = theme.ColorNameWarningOnBackground
case SuccessImportance:
- color = theme.ColorNameSuccess
+ color = theme.ColorNameSuccessOnBackground
default:
color = theme.ColorNameForeground
}
diff --git a/widget/radio_group_internal_test.go b/widget/radio_group_internal_test.go
index 392c19f63b..a4669c28a9 100644
--- a/widget/radio_group_internal_test.go
+++ b/widget/radio_group_internal_test.go
@@ -66,7 +66,7 @@ func TestRadioGroup_DisableWhenSelected(t *testing.T) {
radio := NewRadioGroup([]string{"Hi"}, nil)
radio.SetSelected("Hi")
render := radioGroupTestItemRenderer(t, radio, 0)
- assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "primary_"))
+ assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "primaryOnBackground_"))
radio.Disable()
assert.True(t, strings.HasPrefix(render.icon.Resource.Name(), "disabled_"))
diff --git a/widget/radio_item.go b/widget/radio_item.go
index fbcf075eb1..c4b8f3d017 100644
--- a/widget/radio_item.go
+++ b/widget/radio_item.go
@@ -195,7 +195,7 @@ func (r *radioItemRenderer) update() {
in := theme.NewThemedResource(th.Icon(theme.IconNameRadioButtonFill))
in.ColorName = theme.ColorNameInputBackground
if r.item.Selected {
- in.ColorName = theme.ColorNamePrimary
+ in.ColorName = theme.ColorNamePrimaryOnBackground
out.ColorName = theme.ColorNameForeground
}
if r.item.Disabled() {
diff --git a/widget/richtext_test.go b/widget/richtext_test.go
index bbb8b84aed..d8033375d0 100644
--- a/widget/richtext_test.go
+++ b/widget/richtext_test.go
@@ -26,7 +26,7 @@ func richTextRenderTexts(rich fyne.Widget) []*canvas.Text {
func trailingBoldErrorSegment() *TextSegment {
return &TextSegment{Style: RichTextStyle{
Alignment: fyne.TextAlignTrailing,
- ColorName: theme.ColorNameError,
+ ColorName: theme.ColorNameErrorOnBackground,
TextStyle: fyne.TextStyle{Bold: true},
}}
}
@@ -356,7 +356,7 @@ func TestText_Multiline(t *testing.T) {
func TestText_Color(t *testing.T) {
text := NewRichText(trailingBoldErrorSegment())
- assert.Equal(t, theme.Color(theme.ColorNameError), richTextRenderTexts(text)[0].Color)
+ assert.Equal(t, theme.Color(theme.ColorNameErrorOnBackground), richTextRenderTexts(text)[0].Color)
}
func TestTextRenderer_ApplyTheme(t *testing.T) {
diff --git a/widget/testdata/check/layout_checked.xml b/widget/testdata/check/layout_checked.xml
index 300c8e2293..79feb4ee1f 100644
--- a/widget/testdata/check/layout_checked.xml
+++ b/widget/testdata/check/layout_checked.xml
@@ -4,7 +4,7 @@
-
+
Test
diff --git a/widget/testdata/check_group/focus_a_focused_b_selected.xml b/widget/testdata/check_group/focus_a_focused_b_selected.xml
index 3d60b48555..18ae5f430e 100644
--- a/widget/testdata/check_group/focus_a_focused_b_selected.xml
+++ b/widget/testdata/check_group/focus_a_focused_b_selected.xml
@@ -10,13 +10,13 @@
-
+
Option B
-
+
Option C
diff --git a/widget/testdata/check_group/focus_b_focused_b_selected.xml b/widget/testdata/check_group/focus_b_focused_b_selected.xml
index 3defdae7fc..72208f9fa9 100644
--- a/widget/testdata/check_group/focus_b_focused_b_selected.xml
+++ b/widget/testdata/check_group/focus_b_focused_b_selected.xml
@@ -10,13 +10,13 @@
-
+
Option B
-
+
Option C
diff --git a/widget/testdata/check_group/focus_none_focused_b_selected.xml b/widget/testdata/check_group/focus_none_focused_b_selected.xml
index b39170a60e..72cb4202b1 100644
--- a/widget/testdata/check_group/focus_none_focused_b_selected.xml
+++ b/widget/testdata/check_group/focus_none_focused_b_selected.xml
@@ -10,13 +10,13 @@
-
+
Option B
-
+
Option C
diff --git a/widget/testdata/check_group/layout_multiple_selected.xml b/widget/testdata/check_group/layout_multiple_selected.xml
index ed6c652cb5..514a1b7d5d 100644
--- a/widget/testdata/check_group/layout_multiple_selected.xml
+++ b/widget/testdata/check_group/layout_multiple_selected.xml
@@ -4,13 +4,13 @@
-
+
Foo
-
+
Bar
diff --git a/widget/testdata/check_group/layout_multiple_selected_horizontal.xml b/widget/testdata/check_group/layout_multiple_selected_horizontal.xml
index db7ed8256b..a54f857c25 100644
--- a/widget/testdata/check_group/layout_multiple_selected_horizontal.xml
+++ b/widget/testdata/check_group/layout_multiple_selected_horizontal.xml
@@ -4,13 +4,13 @@
-
+
Foo
-
+
Bar
diff --git a/widget/testdata/check_group/layout_single_selected.xml b/widget/testdata/check_group/layout_single_selected.xml
index ffcb790f84..40eb7fecf7 100644
--- a/widget/testdata/check_group/layout_single_selected.xml
+++ b/widget/testdata/check_group/layout_single_selected.xml
@@ -4,7 +4,7 @@
-
+
Test
diff --git a/widget/testdata/check_group/layout_single_selected_horizontal.xml b/widget/testdata/check_group/layout_single_selected_horizontal.xml
index ffcb790f84..40eb7fecf7 100644
--- a/widget/testdata/check_group/layout_single_selected_horizontal.xml
+++ b/widget/testdata/check_group/layout_single_selected_horizontal.xml
@@ -4,7 +4,7 @@
-
+
Test
diff --git a/widget/testdata/entry/focus_gained.xml b/widget/testdata/entry/focus_gained.xml
index 3290fc27c4..6539e6ef83 100644
--- a/widget/testdata/entry/focus_gained.xml
+++ b/widget/testdata/entry/focus_gained.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/focus_with_popup_dismissed.xml b/widget/testdata/entry/focus_with_popup_dismissed.xml
index 3290fc27c4..6539e6ef83 100644
--- a/widget/testdata/entry/focus_with_popup_dismissed.xml
+++ b/widget/testdata/entry/focus_with_popup_dismissed.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/focus_with_popup_entry_selected.xml b/widget/testdata/entry/focus_with_popup_entry_selected.xml
index 3290fc27c4..6539e6ef83 100644
--- a/widget/testdata/entry/focus_with_popup_entry_selected.xml
+++ b/widget/testdata/entry/focus_with_popup_entry_selected.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/focus_with_popup_initial.xml b/widget/testdata/entry/focus_with_popup_initial.xml
index 3b16dfd27f..ec94832312 100644
--- a/widget/testdata/entry/focus_with_popup_initial.xml
+++ b/widget/testdata/entry/focus_with_popup_initial.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/focused_enabled.xml b/widget/testdata/entry/focused_enabled.xml
index 3290fc27c4..6539e6ef83 100644
--- a/widget/testdata/entry/focused_enabled.xml
+++ b/widget/testdata/entry/focused_enabled.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/on_key_down_newline_typed.xml b/widget/testdata/entry/on_key_down_newline_typed.xml
index 321fd86f89..8202538993 100644
--- a/widget/testdata/entry/on_key_down_newline_typed.xml
+++ b/widget/testdata/entry/on_key_down_newline_typed.xml
@@ -2,14 +2,14 @@
-
+
H
oi
-
+
diff --git a/widget/testdata/entry/select_add_selection.xml b/widget/testdata/entry/select_add_selection.xml
index b0324bcc2a..517bd97c38 100644
--- a/widget/testdata/entry/select_add_selection.xml
+++ b/widget/testdata/entry/select_add_selection.xml
@@ -2,13 +2,13 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_all_initial.xml b/widget/testdata/entry/select_all_initial.xml
index f4e79889d4..2b31f5a7c3 100644
--- a/widget/testdata/entry/select_all_initial.xml
+++ b/widget/testdata/entry/select_all_initial.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Second Row
Third Row
-
+
diff --git a/widget/testdata/entry/select_all_selected.xml b/widget/testdata/entry/select_all_selected.xml
index fd8313d980..17a1f8d56d 100644
--- a/widget/testdata/entry/select_all_selected.xml
+++ b/widget/testdata/entry/select_all_selected.xml
@@ -2,7 +2,7 @@
-
+
@@ -13,7 +13,7 @@
Second Row
Third Row
-
+
diff --git a/widget/testdata/entry/select_initial.xml b/widget/testdata/entry/select_initial.xml
index 61c9351aa3..ff92731891 100644
--- a/widget/testdata/entry/select_initial.xml
+++ b/widget/testdata/entry/select_initial.xml
@@ -2,12 +2,12 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_move_wo_shift.xml b/widget/testdata/entry/select_move_wo_shift.xml
index 1fddbbf513..90b65c1e13 100644
--- a/widget/testdata/entry/select_move_wo_shift.xml
+++ b/widget/testdata/entry/select_move_wo_shift.xml
@@ -2,12 +2,12 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_multi_line_initial.xml b/widget/testdata/entry/select_multi_line_initial.xml
index 86357a6cfe..1c84068f14 100644
--- a/widget/testdata/entry/select_multi_line_initial.xml
+++ b/widget/testdata/entry/select_multi_line_initial.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/select_multi_line_pagedown.xml b/widget/testdata/entry/select_multi_line_pagedown.xml
index 76f2d29514..ef04b90bcf 100644
--- a/widget/testdata/entry/select_multi_line_pagedown.xml
+++ b/widget/testdata/entry/select_multi_line_pagedown.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/select_multi_line_shift_pagedown.xml b/widget/testdata/entry/select_multi_line_shift_pagedown.xml
index afdcb2b55b..cc80b880a9 100644
--- a/widget/testdata/entry/select_multi_line_shift_pagedown.xml
+++ b/widget/testdata/entry/select_multi_line_shift_pagedown.xml
@@ -2,7 +2,7 @@
-
+
@@ -13,7 +13,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/select_multi_line_shift_pageup.xml b/widget/testdata/entry/select_multi_line_shift_pageup.xml
index 5874107738..befb0a9754 100644
--- a/widget/testdata/entry/select_multi_line_shift_pageup.xml
+++ b/widget/testdata/entry/select_multi_line_shift_pageup.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/select_select_left.xml b/widget/testdata/entry/select_select_left.xml
index bd4066311b..b5c6295beb 100644
--- a/widget/testdata/entry/select_select_left.xml
+++ b/widget/testdata/entry/select_select_left.xml
@@ -2,13 +2,13 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_selected.xml b/widget/testdata/entry/select_selected.xml
index 728b2a5fba..351a10bbfa 100644
--- a/widget/testdata/entry/select_selected.xml
+++ b/widget/testdata/entry/select_selected.xml
@@ -2,13 +2,13 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_single_line_pagedown.xml b/widget/testdata/entry/select_single_line_pagedown.xml
index d850527754..c175fd1580 100644
--- a/widget/testdata/entry/select_single_line_pagedown.xml
+++ b/widget/testdata/entry/select_single_line_pagedown.xml
@@ -2,12 +2,12 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_single_line_shift_pagedown.xml b/widget/testdata/entry/select_single_line_shift_pagedown.xml
index 06b0504606..125200f98e 100644
--- a/widget/testdata/entry/select_single_line_shift_pagedown.xml
+++ b/widget/testdata/entry/select_single_line_shift_pagedown.xml
@@ -2,13 +2,13 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/select_single_line_shift_pageup.xml b/widget/testdata/entry/select_single_line_shift_pageup.xml
index 3881516b5e..ddeef3f462 100644
--- a/widget/testdata/entry/select_single_line_shift_pageup.xml
+++ b/widget/testdata/entry/select_single_line_shift_pageup.xml
@@ -2,13 +2,13 @@
-
+
Testing
-
+
diff --git a/widget/testdata/entry/selection_add_one_row_down.xml b/widget/testdata/entry/selection_add_one_row_down.xml
index fb5bb84322..3de802cb08 100644
--- a/widget/testdata/entry/selection_add_one_row_down.xml
+++ b/widget/testdata/entry/selection_add_one_row_down.xml
@@ -2,7 +2,7 @@
-
+
@@ -12,7 +12,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_add_to_end.xml b/widget/testdata/entry/selection_add_to_end.xml
index 4372d76554..3d016ae147 100644
--- a/widget/testdata/entry/selection_add_to_end.xml
+++ b/widget/testdata/entry/selection_add_to_end.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_add_to_home.xml b/widget/testdata/entry/selection_add_to_home.xml
index 9946bb4f71..912a488518 100644
--- a/widget/testdata/entry/selection_add_to_home.xml
+++ b/widget/testdata/entry/selection_add_to_home.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_delete_and_add_down.xml b/widget/testdata/entry/selection_delete_and_add_down.xml
index 9de85112ff..f5cef62dda 100644
--- a/widget/testdata/entry/selection_delete_and_add_down.xml
+++ b/widget/testdata/entry/selection_delete_and_add_down.xml
@@ -2,7 +2,7 @@
-
+
@@ -12,7 +12,7 @@
Teng
Testing
-
+
diff --git a/widget/testdata/entry/selection_delete_and_add_up.xml b/widget/testdata/entry/selection_delete_and_add_up.xml
index dd40f74d29..a850d56166 100644
--- a/widget/testdata/entry/selection_delete_and_add_up.xml
+++ b/widget/testdata/entry/selection_delete_and_add_up.xml
@@ -2,7 +2,7 @@
-
+
@@ -12,7 +12,7 @@
Teng
Testing
-
+
diff --git a/widget/testdata/entry/selection_delete_multi_line.xml b/widget/testdata/entry/selection_delete_multi_line.xml
index c6a6d2f318..8ea8399162 100644
--- a/widget/testdata/entry/selection_delete_multi_line.xml
+++ b/widget/testdata/entry/selection_delete_multi_line.xml
@@ -2,14 +2,14 @@
-
+
Testing
Teng
-
+
diff --git a/widget/testdata/entry/selection_delete_reverse_multi_line.xml b/widget/testdata/entry/selection_delete_reverse_multi_line.xml
index c0be0b6afb..c0c0f057aa 100644
--- a/widget/testdata/entry/selection_delete_reverse_multi_line.xml
+++ b/widget/testdata/entry/selection_delete_reverse_multi_line.xml
@@ -2,14 +2,14 @@
-
+
Testing
Testisting
-
+
diff --git a/widget/testdata/entry/selection_delete_single_line.xml b/widget/testdata/entry/selection_delete_single_line.xml
index 9426c37ee3..373d0e980d 100644
--- a/widget/testdata/entry/selection_delete_single_line.xml
+++ b/widget/testdata/entry/selection_delete_single_line.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Teng
Testing
-
+
diff --git a/widget/testdata/entry/selection_deselect_backspace.xml b/widget/testdata/entry/selection_deselect_backspace.xml
index 09fb24384e..db94638906 100644
--- a/widget/testdata/entry/selection_deselect_backspace.xml
+++ b/widget/testdata/entry/selection_deselect_backspace.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Tsting
Testing
-
+
diff --git a/widget/testdata/entry/selection_deselect_delete.xml b/widget/testdata/entry/selection_deselect_delete.xml
index 8e82ab31de..03e9715d31 100644
--- a/widget/testdata/entry/selection_deselect_delete.xml
+++ b/widget/testdata/entry/selection_deselect_delete.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Teting
Testing
-
+
diff --git a/widget/testdata/entry/selection_deselect_select_backspace.xml b/widget/testdata/entry/selection_deselect_select_backspace.xml
index 9793734e1e..a4072b03f0 100644
--- a/widget/testdata/entry/selection_deselect_select_backspace.xml
+++ b/widget/testdata/entry/selection_deselect_select_backspace.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Teing
Testing
-
+
diff --git a/widget/testdata/entry/selection_end.xml b/widget/testdata/entry/selection_end.xml
index 87ff271496..ea15f7877d 100644
--- a/widget/testdata/entry/selection_end.xml
+++ b/widget/testdata/entry/selection_end.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_enter.xml b/widget/testdata/entry/selection_enter.xml
index 6830e5bdf2..6fda018ff8 100644
--- a/widget/testdata/entry/selection_enter.xml
+++ b/widget/testdata/entry/selection_enter.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
ng
Testing
-
+
diff --git a/widget/testdata/entry/selection_focus_gained.xml b/widget/testdata/entry/selection_focus_gained.xml
index 15a8af57f6..9804308488 100644
--- a/widget/testdata/entry/selection_focus_gained.xml
+++ b/widget/testdata/entry/selection_focus_gained.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_home.xml b/widget/testdata/entry/selection_home.xml
index 0b648e73e9..d7bc561a84 100644
--- a/widget/testdata/entry/selection_home.xml
+++ b/widget/testdata/entry/selection_home.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_initial.xml b/widget/testdata/entry/selection_initial.xml
index 15a8af57f6..9804308488 100644
--- a/widget/testdata/entry/selection_initial.xml
+++ b/widget/testdata/entry/selection_initial.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_initial_reverse.xml b/widget/testdata/entry/selection_initial_reverse.xml
index 79723f5a5d..d22c1e7d16 100644
--- a/widget/testdata/entry/selection_initial_reverse.xml
+++ b/widget/testdata/entry/selection_initial_reverse.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_remove_add_one_row_up.xml b/widget/testdata/entry/selection_remove_add_one_row_up.xml
index 447e5e4abb..ce021a3a24 100644
--- a/widget/testdata/entry/selection_remove_add_one_row_up.xml
+++ b/widget/testdata/entry/selection_remove_add_one_row_up.xml
@@ -2,7 +2,7 @@
-
+
@@ -12,7 +12,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_remove_one_row_up.xml b/widget/testdata/entry/selection_remove_one_row_up.xml
index 15a8af57f6..9804308488 100644
--- a/widget/testdata/entry/selection_remove_one_row_up.xml
+++ b/widget/testdata/entry/selection_remove_one_row_up.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_replace.xml b/widget/testdata/entry/selection_replace.xml
index 331dcb4048..9f7a2da7be 100644
--- a/widget/testdata/entry/selection_replace.xml
+++ b/widget/testdata/entry/selection_replace.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Tehellong
Testing
-
+
diff --git a/widget/testdata/entry/selection_snap_down.xml b/widget/testdata/entry/selection_snap_down.xml
index a7ed5c51ee..d56c91beb5 100644
--- a/widget/testdata/entry/selection_snap_down.xml
+++ b/widget/testdata/entry/selection_snap_down.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_snap_left.xml b/widget/testdata/entry/selection_snap_left.xml
index dcb9c591a1..0e65d3b2b5 100644
--- a/widget/testdata/entry/selection_snap_left.xml
+++ b/widget/testdata/entry/selection_snap_left.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_snap_right.xml b/widget/testdata/entry/selection_snap_right.xml
index 5a4700a765..7b11f09a43 100644
--- a/widget/testdata/entry/selection_snap_right.xml
+++ b/widget/testdata/entry/selection_snap_right.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/selection_snap_up.xml b/widget/testdata/entry/selection_snap_up.xml
index 21ab579332..05e61450bf 100644
--- a/widget/testdata/entry/selection_snap_up.xml
+++ b/widget/testdata/entry/selection_snap_up.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
Testing
Testing
-
+
diff --git a/widget/testdata/entry/tab-content.png b/widget/testdata/entry/tab-content.png
index f9e4410419..8a01c171cc 100644
Binary files a/widget/testdata/entry/tab-content.png and b/widget/testdata/entry/tab-content.png differ
diff --git a/widget/testdata/entry/tab-select.png b/widget/testdata/entry/tab-select.png
index b41ed0f8f4..89bd881379 100644
Binary files a/widget/testdata/entry/tab-select.png and b/widget/testdata/entry/tab-select.png differ
diff --git a/widget/testdata/entry/tapped_focused.xml b/widget/testdata/entry/tapped_focused.xml
index 85aafd5b93..181652c62c 100644
--- a/widget/testdata/entry/tapped_focused.xml
+++ b/widget/testdata/entry/tapped_focused.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
WWW
-
+
diff --git a/widget/testdata/entry/tapped_secondary_full_menu.xml b/widget/testdata/entry/tapped_secondary_full_menu.xml
index 13de8f5a59..1817663a0d 100644
--- a/widget/testdata/entry/tapped_secondary_full_menu.xml
+++ b/widget/testdata/entry/tapped_secondary_full_menu.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/tapped_secondary_password_menu.xml b/widget/testdata/entry/tapped_secondary_password_menu.xml
index 16435e3363..fbb0efbff4 100644
--- a/widget/testdata/entry/tapped_secondary_password_menu.xml
+++ b/widget/testdata/entry/tapped_secondary_password_menu.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/widget/testdata/entry/tapped_tapped_2nd_m.xml b/widget/testdata/entry/tapped_tapped_2nd_m.xml
index e6609d0286..a97d8c3ec0 100644
--- a/widget/testdata/entry/tapped_tapped_2nd_m.xml
+++ b/widget/testdata/entry/tapped_tapped_2nd_m.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
WWW
-
+
diff --git a/widget/testdata/entry/tapped_tapped_3rd_m.xml b/widget/testdata/entry/tapped_tapped_3rd_m.xml
index 98c6352d47..172d3b0080 100644
--- a/widget/testdata/entry/tapped_tapped_3rd_m.xml
+++ b/widget/testdata/entry/tapped_tapped_3rd_m.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
WWW
-
+
diff --git a/widget/testdata/entry/tapped_tapped_after_last_col.xml b/widget/testdata/entry/tapped_tapped_after_last_col.xml
index e653fb13c6..84626db853 100644
--- a/widget/testdata/entry/tapped_tapped_after_last_col.xml
+++ b/widget/testdata/entry/tapped_tapped_after_last_col.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
WWW
-
+
diff --git a/widget/testdata/entry/tapped_tapped_after_last_row.xml b/widget/testdata/entry/tapped_tapped_after_last_row.xml
index 9c4701c4d0..58763ce17c 100644
--- a/widget/testdata/entry/tapped_tapped_after_last_row.xml
+++ b/widget/testdata/entry/tapped_tapped_after_last_row.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
WWW
-
+
diff --git a/widget/testdata/entry/undo_redo_5undo.png b/widget/testdata/entry/undo_redo_5undo.png
index a7ae273e1f..b59970fd8a 100644
Binary files a/widget/testdata/entry/undo_redo_5undo.png and b/widget/testdata/entry/undo_redo_5undo.png differ
diff --git a/widget/testdata/entry/undo_redo_initial.png b/widget/testdata/entry/undo_redo_initial.png
index a5fc70efc0..517b2f3745 100644
Binary files a/widget/testdata/entry/undo_redo_initial.png and b/widget/testdata/entry/undo_redo_initial.png differ
diff --git a/widget/testdata/entry/undo_redo_mistake_corrected.png b/widget/testdata/entry/undo_redo_mistake_corrected.png
index 05bfe03764..37a0b1a159 100644
Binary files a/widget/testdata/entry/undo_redo_mistake_corrected.png and b/widget/testdata/entry/undo_redo_mistake_corrected.png differ
diff --git a/widget/testdata/entry/undo_redo_mistkaes.png b/widget/testdata/entry/undo_redo_mistkaes.png
index aa83686805..1e2d6592a8 100644
Binary files a/widget/testdata/entry/undo_redo_mistkaes.png and b/widget/testdata/entry/undo_redo_mistkaes.png differ
diff --git a/widget/testdata/entry/validate_invalid.xml b/widget/testdata/entry/validate_invalid.xml
index 5ca122275c..7e377c231f 100644
--- a/widget/testdata/entry/validate_invalid.xml
+++ b/widget/testdata/entry/validate_invalid.xml
@@ -2,7 +2,7 @@
-
+
2020-02
diff --git a/widget/testdata/entry/validate_valid.xml b/widget/testdata/entry/validate_valid.xml
index ecf591962d..ade6721e47 100644
--- a/widget/testdata/entry/validate_valid.xml
+++ b/widget/testdata/entry/validate_valid.xml
@@ -2,12 +2,12 @@
-
+
2020-02-12
-
+
diff --git a/widget/testdata/entry/validation_set_invalid.png b/widget/testdata/entry/validation_set_invalid.png
index f8018c7693..5ffc3575ba 100644
Binary files a/widget/testdata/entry/validation_set_invalid.png and b/widget/testdata/entry/validation_set_invalid.png differ
diff --git a/widget/testdata/entry/validator_not_empty_focused.xml b/widget/testdata/entry/validator_not_empty_focused.xml
index 5c13984e7a..226f526908 100644
--- a/widget/testdata/entry/validator_not_empty_focused.xml
+++ b/widget/testdata/entry/validator_not_empty_focused.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/widget/testdata/entry/validator_not_empty_unfocused.xml b/widget/testdata/entry/validator_not_empty_unfocused.xml
index 0ae0f2e3e4..683f79f6f2 100644
--- a/widget/testdata/entry/validator_not_empty_unfocused.xml
+++ b/widget/testdata/entry/validator_not_empty_unfocused.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/widget/testdata/entry/wrap_multi_line_cursor.png b/widget/testdata/entry/wrap_multi_line_cursor.png
index 40470bdb5b..64ec3a400a 100644
Binary files a/widget/testdata/entry/wrap_multi_line_cursor.png and b/widget/testdata/entry/wrap_multi_line_cursor.png differ
diff --git a/widget/testdata/entry/wrap_multi_line_off.xml b/widget/testdata/entry/wrap_multi_line_off.xml
index 7f836eb179..af35388a04 100644
--- a/widget/testdata/entry/wrap_multi_line_off.xml
+++ b/widget/testdata/entry/wrap_multi_line_off.xml
@@ -2,12 +2,12 @@
-
+
A long text on short words w/o NLs or LFs.
-
+
diff --git a/widget/testdata/entry/wrap_multi_line_truncate.xml b/widget/testdata/entry/wrap_multi_line_truncate.xml
index 6c1447c3da..7f4d3d6751 100644
--- a/widget/testdata/entry/wrap_multi_line_truncate.xml
+++ b/widget/testdata/entry/wrap_multi_line_truncate.xml
@@ -2,13 +2,13 @@
-
+
A long text on short words w/o NLs or LFs.
-
+
diff --git a/widget/testdata/entry/wrap_multi_line_wrap_break.xml b/widget/testdata/entry/wrap_multi_line_wrap_break.xml
index bbfe428821..262f05d212 100644
--- a/widget/testdata/entry/wrap_multi_line_wrap_break.xml
+++ b/widget/testdata/entry/wrap_multi_line_wrap_break.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
hort words w/o
NLs or LFs.
-
+
diff --git a/widget/testdata/entry/wrap_multi_line_wrap_word.xml b/widget/testdata/entry/wrap_multi_line_wrap_word.xml
index 2167cee073..14169018a5 100644
--- a/widget/testdata/entry/wrap_multi_line_wrap_word.xml
+++ b/widget/testdata/entry/wrap_multi_line_wrap_word.xml
@@ -2,7 +2,7 @@
-
+
@@ -10,7 +10,7 @@
short words
w/o NLs or LFs.
-
+
diff --git a/widget/testdata/entry/wrap_single_line_off.xml b/widget/testdata/entry/wrap_single_line_off.xml
index b87272a20d..de144b1fed 100644
--- a/widget/testdata/entry/wrap_single_line_off.xml
+++ b/widget/testdata/entry/wrap_single_line_off.xml
@@ -2,12 +2,12 @@
-
+
Testing Wrapping
-
+
diff --git a/widget/testdata/entry/wrap_single_line_truncate.xml b/widget/testdata/entry/wrap_single_line_truncate.xml
index c3c7f10909..bf583919bd 100644
--- a/widget/testdata/entry/wrap_single_line_truncate.xml
+++ b/widget/testdata/entry/wrap_single_line_truncate.xml
@@ -2,13 +2,13 @@
-
+
Testing Wrapping
-
+
diff --git a/widget/testdata/form/disable_validation_disabled_invalid.png b/widget/testdata/form/disable_validation_disabled_invalid.png
index 8f2f51ac9d..9462689884 100644
Binary files a/widget/testdata/form/disable_validation_disabled_invalid.png and b/widget/testdata/form/disable_validation_disabled_invalid.png differ
diff --git a/widget/testdata/form/disable_validation_enabled_invalid.png b/widget/testdata/form/disable_validation_enabled_invalid.png
index 46dcde00a3..20f4517b16 100644
Binary files a/widget/testdata/form/disable_validation_enabled_invalid.png and b/widget/testdata/form/disable_validation_enabled_invalid.png differ
diff --git a/widget/testdata/form/disable_validation_initial.png b/widget/testdata/form/disable_validation_initial.png
index 46dcde00a3..20f4517b16 100644
Binary files a/widget/testdata/form/disable_validation_initial.png and b/widget/testdata/form/disable_validation_initial.png differ
diff --git a/widget/testdata/form/hint_initial.png b/widget/testdata/form/hint_initial.png
index 77013e3df5..10995fc73b 100644
Binary files a/widget/testdata/form/hint_initial.png and b/widget/testdata/form/hint_initial.png differ
diff --git a/widget/testdata/form/hint_invalid.png b/widget/testdata/form/hint_invalid.png
index f4747cfb9c..31f7aa28fc 100644
Binary files a/widget/testdata/form/hint_invalid.png and b/widget/testdata/form/hint_invalid.png differ
diff --git a/widget/testdata/form/hint_valid.png b/widget/testdata/form/hint_valid.png
index 51bb93b912..bbd77f8a1a 100644
Binary files a/widget/testdata/form/hint_valid.png and b/widget/testdata/form/hint_valid.png differ
diff --git a/widget/testdata/form/validation_entry_first_type_invalid.png b/widget/testdata/form/validation_entry_first_type_invalid.png
index 6bbbf07d2a..a4525c3f90 100644
Binary files a/widget/testdata/form/validation_entry_first_type_invalid.png and b/widget/testdata/form/validation_entry_first_type_invalid.png differ
diff --git a/widget/testdata/form/validation_entry_first_type_valid.png b/widget/testdata/form/validation_entry_first_type_valid.png
index 0dccbff58e..512634d4fe 100644
Binary files a/widget/testdata/form/validation_entry_first_type_valid.png and b/widget/testdata/form/validation_entry_first_type_valid.png differ
diff --git a/widget/testdata/form/validation_initial.png b/widget/testdata/form/validation_initial.png
index e8fe0ec588..344f05fae3 100644
Binary files a/widget/testdata/form/validation_initial.png and b/widget/testdata/form/validation_initial.png differ
diff --git a/widget/testdata/form/validation_invalid.png b/widget/testdata/form/validation_invalid.png
index 478177d243..74155b00e6 100644
Binary files a/widget/testdata/form/validation_invalid.png and b/widget/testdata/form/validation_invalid.png differ
diff --git a/widget/testdata/form/validation_valid.png b/widget/testdata/form/validation_valid.png
index 8cbf5b95e0..ac5a3d61fa 100644
Binary files a/widget/testdata/form/validation_valid.png and b/widget/testdata/form/validation_valid.png differ
diff --git a/widget/testdata/label/label_importance_danger.png b/widget/testdata/label/label_importance_danger.png
index 16b708b5db..babd2bc4c5 100644
Binary files a/widget/testdata/label/label_importance_danger.png and b/widget/testdata/label/label_importance_danger.png differ
diff --git a/widget/testdata/label/label_importance_high.png b/widget/testdata/label/label_importance_high.png
index 91ffbdd98c..a93c45f19e 100644
Binary files a/widget/testdata/label/label_importance_high.png and b/widget/testdata/label/label_importance_high.png differ
diff --git a/widget/testdata/label/label_importance_success.png b/widget/testdata/label/label_importance_success.png
index 36d1f21fc8..d5c9d23311 100644
Binary files a/widget/testdata/label/label_importance_success.png and b/widget/testdata/label/label_importance_success.png differ
diff --git a/widget/testdata/label/label_importance_warning.png b/widget/testdata/label/label_importance_warning.png
index 21d8b586a7..cd87b911ae 100644
Binary files a/widget/testdata/label/label_importance_warning.png and b/widget/testdata/label/label_importance_warning.png differ
diff --git a/widget/testdata/password_entry/concealed.xml b/widget/testdata/password_entry/concealed.xml
index d940f0ce1c..6f07d7af14 100644
--- a/widget/testdata/password_entry/concealed.xml
+++ b/widget/testdata/password_entry/concealed.xml
@@ -2,13 +2,13 @@
-
+
••••••
-
+
diff --git a/widget/testdata/password_entry/obfuscation_typed.xml b/widget/testdata/password_entry/obfuscation_typed.xml
index c50cf399d4..6c6710130a 100644
--- a/widget/testdata/password_entry/obfuscation_typed.xml
+++ b/widget/testdata/password_entry/obfuscation_typed.xml
@@ -2,13 +2,13 @@
-
+
•••••••
-
+
diff --git a/widget/testdata/password_entry/placeholder_typed.xml b/widget/testdata/password_entry/placeholder_typed.xml
index c50cf399d4..6c6710130a 100644
--- a/widget/testdata/password_entry/placeholder_typed.xml
+++ b/widget/testdata/password_entry/placeholder_typed.xml
@@ -2,13 +2,13 @@
-
+
•••••••
-
+
diff --git a/widget/testdata/password_entry/revealed.xml b/widget/testdata/password_entry/revealed.xml
index e72e2674f7..bd744d2541 100644
--- a/widget/testdata/password_entry/revealed.xml
+++ b/widget/testdata/password_entry/revealed.xml
@@ -2,13 +2,13 @@
-
+
Secret
-
+
diff --git a/widget/testdata/radio_group/focus_a_focused_b_selected.xml b/widget/testdata/radio_group/focus_a_focused_b_selected.xml
index fcd6c30aa3..8033aa6656 100644
--- a/widget/testdata/radio_group/focus_a_focused_b_selected.xml
+++ b/widget/testdata/radio_group/focus_a_focused_b_selected.xml
@@ -10,7 +10,7 @@
-
+
Option B
diff --git a/widget/testdata/radio_group/focus_b_focused_b_selected.xml b/widget/testdata/radio_group/focus_b_focused_b_selected.xml
index 15fa416c1e..65984d1b51 100644
--- a/widget/testdata/radio_group/focus_b_focused_b_selected.xml
+++ b/widget/testdata/radio_group/focus_b_focused_b_selected.xml
@@ -10,7 +10,7 @@
-
+
Option B
diff --git a/widget/testdata/radio_group/focus_none_focused_b_selected.xml b/widget/testdata/radio_group/focus_none_focused_b_selected.xml
index 8a592de139..e366e4bb8e 100644
--- a/widget/testdata/radio_group/focus_none_focused_b_selected.xml
+++ b/widget/testdata/radio_group/focus_none_focused_b_selected.xml
@@ -10,7 +10,7 @@
-
+
Option B
diff --git a/widget/testdata/radio_group/layout_multiple_selected.xml b/widget/testdata/radio_group/layout_multiple_selected.xml
index dfd559a4d6..6796ff3288 100644
--- a/widget/testdata/radio_group/layout_multiple_selected.xml
+++ b/widget/testdata/radio_group/layout_multiple_selected.xml
@@ -4,7 +4,7 @@
-
+
Foo
diff --git a/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml b/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml
index e77574e249..f9dc4d8aa5 100644
--- a/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml
+++ b/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml
@@ -4,7 +4,7 @@
-
+
Foo
diff --git a/widget/testdata/radio_group/layout_single_selected.xml b/widget/testdata/radio_group/layout_single_selected.xml
index 57e4b3862f..45b5d237e6 100644
--- a/widget/testdata/radio_group/layout_single_selected.xml
+++ b/widget/testdata/radio_group/layout_single_selected.xml
@@ -4,7 +4,7 @@
-
+
Test
diff --git a/widget/testdata/radio_group/layout_single_selected_horizontal.xml b/widget/testdata/radio_group/layout_single_selected_horizontal.xml
index 57e4b3862f..45b5d237e6 100644
--- a/widget/testdata/radio_group/layout_single_selected_horizontal.xml
+++ b/widget/testdata/radio_group/layout_single_selected_horizontal.xml
@@ -4,7 +4,7 @@
-
+
Test