diff --git a/canvas/testdata/text/layout_long_center_small.png b/canvas/testdata/text/layout_long_center_small.png index 4ae88a6687..fac4f5a734 100644 Binary files a/canvas/testdata/text/layout_long_center_small.png and b/canvas/testdata/text/layout_long_center_small.png differ diff --git a/canvas/testdata/text/layout_long_leading_small.png b/canvas/testdata/text/layout_long_leading_small.png index 4ae88a6687..fac4f5a734 100644 Binary files a/canvas/testdata/text/layout_long_leading_small.png and b/canvas/testdata/text/layout_long_leading_small.png differ diff --git a/canvas/testdata/text/layout_long_trailing_large.png b/canvas/testdata/text/layout_long_trailing_large.png index 1bd1a8940e..e85ba662c3 100644 Binary files a/canvas/testdata/text/layout_long_trailing_large.png and b/canvas/testdata/text/layout_long_trailing_large.png differ diff --git a/canvas/testdata/text/layout_long_trailing_small.png b/canvas/testdata/text/layout_long_trailing_small.png index 4ae88a6687..fac4f5a734 100644 Binary files a/canvas/testdata/text/layout_long_trailing_small.png and b/canvas/testdata/text/layout_long_trailing_small.png differ diff --git a/canvas/testdata/text/layout_short_center_small.png b/canvas/testdata/text/layout_short_center_small.png index 1636578aa4..6f3fd8c15b 100644 Binary files a/canvas/testdata/text/layout_short_center_small.png and b/canvas/testdata/text/layout_short_center_small.png differ diff --git a/canvas/testdata/text/layout_short_leading_small.png b/canvas/testdata/text/layout_short_leading_small.png index 1636578aa4..6f3fd8c15b 100644 Binary files a/canvas/testdata/text/layout_short_leading_small.png and b/canvas/testdata/text/layout_short_leading_small.png differ diff --git a/canvas/testdata/text/layout_short_trailing_large.png b/canvas/testdata/text/layout_short_trailing_large.png index 1dc917f5b9..94ca4b7096 100644 Binary files a/canvas/testdata/text/layout_short_trailing_large.png and b/canvas/testdata/text/layout_short_trailing_large.png differ diff --git a/canvas/testdata/text/layout_short_trailing_small.png b/canvas/testdata/text/layout_short_trailing_small.png index 1636578aa4..6f3fd8c15b 100644 Binary files a/canvas/testdata/text/layout_short_trailing_small.png and b/canvas/testdata/text/layout_short_trailing_small.png differ diff --git a/cmd/fyne_settings/settings/appearance.go b/cmd/fyne_settings/settings/appearance.go index ac39b8a739..622c771c15 100644 --- a/cmd/fyne_settings/settings/appearance.go +++ b/cmd/fyne_settings/settings/appearance.go @@ -118,7 +118,7 @@ func (s *Settings) createPreview() image.Image { th = theme.DarkTheme() } - cache.ResetSvg() // reset icon cache + cache.ResetThemeCaches() // reset icon cache fyne.CurrentApp().Settings().(overrideTheme).OverrideTheme(th, s.fyneSettings.PrimaryColor) empty := widget.NewLabel("") @@ -136,7 +136,7 @@ func (s *Settings) createPreview() image.Image { time.Sleep(canvas.DurationShort) img := c.Capture() - cache.ResetSvg() // ensure we re-create the correct cached assets + cache.ResetThemeCaches() // ensure we re-create the correct cached assets fyne.CurrentApp().Settings().(overrideTheme).OverrideTheme(oldTheme, oldColor) return img } diff --git a/container/testdata/apptabs/desktop/change_content_change_hidden.xml b/container/testdata/apptabs/desktop/change_content_change_hidden.xml index d8c73d4b57..b807c5c228 100644 --- a/container/testdata/apptabs/desktop/change_content_change_hidden.xml +++ b/container/testdata/apptabs/desktop/change_content_change_hidden.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text3 + + + + Text3 diff --git a/container/testdata/apptabs/desktop/change_content_change_visible.xml b/container/testdata/apptabs/desktop/change_content_change_visible.xml index d8c73d4b57..b807c5c228 100644 --- a/container/testdata/apptabs/desktop/change_content_change_visible.xml +++ b/container/testdata/apptabs/desktop/change_content_change_visible.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text3 + + + + Text3 diff --git a/container/testdata/apptabs/desktop/change_content_initial.xml b/container/testdata/apptabs/desktop/change_content_initial.xml index 190317a00f..89f113e4af 100644 --- a/container/testdata/apptabs/desktop/change_content_initial.xml +++ b/container/testdata/apptabs/desktop/change_content_initial.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_icon_change_selected.xml b/container/testdata/apptabs/desktop/change_icon_change_selected.xml index f28d7cfd21..28def06f55 100644 --- a/container/testdata/apptabs/desktop/change_icon_change_selected.xml +++ b/container/testdata/apptabs/desktop/change_icon_change_selected.xml @@ -1,20 +1,20 @@ - - - + + + - + - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_icon_change_unselected.xml b/container/testdata/apptabs/desktop/change_icon_change_unselected.xml index f28d7cfd21..28def06f55 100644 --- a/container/testdata/apptabs/desktop/change_icon_change_unselected.xml +++ b/container/testdata/apptabs/desktop/change_icon_change_unselected.xml @@ -1,20 +1,20 @@ - - - + + + - + - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_icon_initial.xml b/container/testdata/apptabs/desktop/change_icon_initial.xml index f28d7cfd21..28def06f55 100644 --- a/container/testdata/apptabs/desktop/change_icon_initial.xml +++ b/container/testdata/apptabs/desktop/change_icon_initial.xml @@ -1,20 +1,20 @@ - - - + + + - + - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_label_change_selected.xml b/container/testdata/apptabs/desktop/change_label_change_selected.xml index 18f52d802b..892ba8dd61 100644 --- a/container/testdata/apptabs/desktop/change_label_change_selected.xml +++ b/container/testdata/apptabs/desktop/change_label_change_selected.xml @@ -1,20 +1,20 @@ - - - - New 1 + + + + New 1 - - Test2 + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_label_change_unselected.xml b/container/testdata/apptabs/desktop/change_label_change_unselected.xml index 42ff95b3bb..54668d4f69 100644 --- a/container/testdata/apptabs/desktop/change_label_change_unselected.xml +++ b/container/testdata/apptabs/desktop/change_label_change_unselected.xml @@ -1,20 +1,20 @@ - - - - New 1 + + + + New 1 - - New 2 + + New 2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/change_label_initial.xml b/container/testdata/apptabs/desktop/change_label_initial.xml index 190317a00f..89f113e4af 100644 --- a/container/testdata/apptabs/desktop/change_label_initial.xml +++ b/container/testdata/apptabs/desktop/change_label_initial.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/dynamic_appended.xml b/container/testdata/apptabs/desktop/dynamic_appended.xml index f9208aff93..88a68fcc8c 100644 --- a/container/testdata/apptabs/desktop/dynamic_appended.xml +++ b/container/testdata/apptabs/desktop/dynamic_appended.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text 1 + + + + 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 fa96fff867..01c7b6734d 100644 --- a/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml +++ b/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml @@ -1,17 +1,17 @@ - - - - Test2 + + + + Test2 - - - - Text 2 + + + + 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 7f5d478402..fde5980f28 100644 --- a/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml +++ b/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml @@ -1,26 +1,26 @@ - - - - Test2 + + + + Test2 - - Test3 + + Test3 - - Test4 + + Test4 - - Test5 + + Test5 - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/apptabs/desktop/dynamic_initial.xml b/container/testdata/apptabs/desktop/dynamic_initial.xml index 686ff055e1..44ac74d107 100644 --- a/container/testdata/apptabs/desktop/dynamic_initial.xml +++ b/container/testdata/apptabs/desktop/dynamic_initial.xml @@ -1,17 +1,17 @@ - - - - Test1 + + + + Test1 - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml b/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml index e89b2d40b2..8fec29a848 100644 --- a/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml +++ b/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml @@ -1,23 +1,23 @@ - - - - Test6 + + + + Test6 - - Test7 + + Test7 - - Test8 + + Test8 - - - - Text 6 + + + + Text 6 diff --git a/container/testdata/apptabs/desktop/hover_first.xml b/container/testdata/apptabs/desktop/hover_first.xml index 9ac3af7fc9..52cf0ced32 100644 --- a/container/testdata/apptabs/desktop/hover_first.xml +++ b/container/testdata/apptabs/desktop/hover_first.xml @@ -1,21 +1,21 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/hover_none.xml b/container/testdata/apptabs/desktop/hover_none.xml index 190317a00f..89f113e4af 100644 --- a/container/testdata/apptabs/desktop/hover_none.xml +++ b/container/testdata/apptabs/desktop/hover_none.xml @@ -1,20 +1,20 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/hover_overflow.xml b/container/testdata/apptabs/desktop/hover_overflow.xml index 1720ecf075..ff17adf17d 100644 --- a/container/testdata/apptabs/desktop/hover_overflow.xml +++ b/container/testdata/apptabs/desktop/hover_overflow.xml @@ -1,22 +1,22 @@ - - - - Test1 + + + + Test1 - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/hover_second.xml b/container/testdata/apptabs/desktop/hover_second.xml index 4910b512a0..b720cbaa45 100644 --- a/container/testdata/apptabs/desktop/hover_second.xml +++ b/container/testdata/apptabs/desktop/hover_second.xml @@ -1,21 +1,21 @@ - - - - Test1 + + + + Test1 - - - Test2 + + + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/desktop/layout_bottom_icon.xml b/container/testdata/apptabs/desktop/layout_bottom_icon.xml index dd587d1efe..e5b56294c5 100644 --- a/container/testdata/apptabs/desktop/layout_bottom_icon.xml +++ b/container/testdata/apptabs/desktop/layout_bottom_icon.xml @@ -1,9 +1,9 @@ - - - + + + 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 af67944264..0cc8f02fdc 100644 --- a/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml +++ b/container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml @@ -1,16 +1,16 @@ - - - - Text1 + + + + Text1 - + diff --git a/container/testdata/apptabs/desktop/layout_bottom_text.xml b/container/testdata/apptabs/desktop/layout_bottom_text.xml index 24d8959330..e722adf7c9 100644 --- a/container/testdata/apptabs/desktop/layout_bottom_text.xml +++ b/container/testdata/apptabs/desktop/layout_bottom_text.xml @@ -1,15 +1,15 @@ - - - - Text2 + + + + Text2 - + 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 b1826fff14..301848ef3d 100644 --- a/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml +++ b/container/testdata/apptabs/desktop/layout_leading_icon_and_text.xml @@ -1,17 +1,17 @@ - - - - Text1 - + + + + Text1 + - - - + + + diff --git a/container/testdata/apptabs/desktop/layout_leading_text.xml b/container/testdata/apptabs/desktop/layout_leading_text.xml index 4b746a0137..8d8032379b 100644 --- a/container/testdata/apptabs/desktop/layout_leading_text.xml +++ b/container/testdata/apptabs/desktop/layout_leading_text.xml @@ -1,16 +1,16 @@ - - - - Text2 + + + + Text2 - - - + + + diff --git a/container/testdata/apptabs/desktop/layout_top_icon.xml b/container/testdata/apptabs/desktop/layout_top_icon.xml index 5afdfa4ada..494827c280 100644 --- a/container/testdata/apptabs/desktop/layout_top_icon.xml +++ b/container/testdata/apptabs/desktop/layout_top_icon.xml @@ -1,16 +1,16 @@ - - - + + + - - - + + + 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 7f699d3e31..b587aa9d4b 100644 --- a/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml +++ b/container/testdata/apptabs/desktop/layout_top_icon_and_text.xml @@ -1,17 +1,17 @@ - - - - Text1 + + + + Text1 - - - + + + diff --git a/container/testdata/apptabs/desktop/layout_top_text.xml b/container/testdata/apptabs/desktop/layout_top_text.xml index b4d58e2343..d359264457 100644 --- a/container/testdata/apptabs/desktop/layout_top_text.xml +++ b/container/testdata/apptabs/desktop/layout_top_text.xml @@ -1,16 +1,16 @@ - - - - Text2 + + + + Text2 - - - + + + 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 8cfd11ed9c..cebdd3c805 100644 --- a/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml +++ b/container/testdata/apptabs/desktop/layout_trailing_icon_and_text.xml @@ -1,16 +1,16 @@ - - - - Text1 - + + + + Text1 + - + diff --git a/container/testdata/apptabs/desktop/layout_trailing_text.xml b/container/testdata/apptabs/desktop/layout_trailing_text.xml index 91fbabc624..23caa986dd 100644 --- a/container/testdata/apptabs/desktop/layout_trailing_text.xml +++ b/container/testdata/apptabs/desktop/layout_trailing_text.xml @@ -1,15 +1,15 @@ - - - - Text2 + + + + Text2 - + diff --git a/container/testdata/apptabs/desktop/tab_location_bottom.xml b/container/testdata/apptabs/desktop/tab_location_bottom.xml index 3446623557..c4089dde19 100644 --- a/container/testdata/apptabs/desktop/tab_location_bottom.xml +++ b/container/testdata/apptabs/desktop/tab_location_bottom.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/tab_location_leading.xml b/container/testdata/apptabs/desktop/tab_location_leading.xml index f1566bafdc..633db00487 100644 --- a/container/testdata/apptabs/desktop/tab_location_leading.xml +++ b/container/testdata/apptabs/desktop/tab_location_leading.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/tab_location_top.xml b/container/testdata/apptabs/desktop/tab_location_top.xml index f7341aec98..8aded83f87 100644 --- a/container/testdata/apptabs/desktop/tab_location_top.xml +++ b/container/testdata/apptabs/desktop/tab_location_top.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/tab_location_trailing.xml b/container/testdata/apptabs/desktop/tab_location_trailing.xml index f9799838f9..99a84d175f 100644 --- a/container/testdata/apptabs/desktop/tab_location_trailing.xml +++ b/container/testdata/apptabs/desktop/tab_location_trailing.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/tapped_first_selected.xml b/container/testdata/apptabs/desktop/tapped_first_selected.xml index 8d9f8f9b9c..fdddf3818f 100644 --- a/container/testdata/apptabs/desktop/tapped_first_selected.xml +++ b/container/testdata/apptabs/desktop/tapped_first_selected.xml @@ -1,23 +1,23 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml index 6913002446..a05dd4d154 100644 --- a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml +++ b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml @@ -1,50 +1,50 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text 1 + + + + Text 1 - - + + - - - - - - - + + + + + + + - - - - - - Test3 + + + + + + Test3 - - Test4 + + Test4 diff --git a/container/testdata/apptabs/desktop/tapped_second_selected.xml b/container/testdata/apptabs/desktop/tapped_second_selected.xml index 8c23ecbcbe..5e40139006 100644 --- a/container/testdata/apptabs/desktop/tapped_second_selected.xml +++ b/container/testdata/apptabs/desktop/tapped_second_selected.xml @@ -1,23 +1,23 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/apptabs/desktop/tapped_third_selected.xml b/container/testdata/apptabs/desktop/tapped_third_selected.xml index 09d09f6e14..119d60a419 100644 --- a/container/testdata/apptabs/desktop/tapped_third_selected.xml +++ b/container/testdata/apptabs/desktop/tapped_third_selected.xml @@ -1,23 +1,23 @@ - - - - Test1 + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - - Text 3 + + + + Text 3 diff --git a/container/testdata/apptabs/mobile/change_content_change_hidden.xml b/container/testdata/apptabs/mobile/change_content_change_hidden.xml index 74e2df0e76..533d6796fe 100644 --- a/container/testdata/apptabs/mobile/change_content_change_hidden.xml +++ b/container/testdata/apptabs/mobile/change_content_change_hidden.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 - Test2 + Test2 - - - - Text3 + + + + Text3 diff --git a/container/testdata/apptabs/mobile/change_content_change_visible.xml b/container/testdata/apptabs/mobile/change_content_change_visible.xml index 74e2df0e76..533d6796fe 100644 --- a/container/testdata/apptabs/mobile/change_content_change_visible.xml +++ b/container/testdata/apptabs/mobile/change_content_change_visible.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 - Test2 + Test2 - - - - Text3 + + + + Text3 diff --git a/container/testdata/apptabs/mobile/change_content_initial.xml b/container/testdata/apptabs/mobile/change_content_initial.xml index ac0e9fe250..dac25ac80d 100644 --- a/container/testdata/apptabs/mobile/change_content_initial.xml +++ b/container/testdata/apptabs/mobile/change_content_initial.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 - Test2 + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/mobile/change_icon_change_selected.xml b/container/testdata/apptabs/mobile/change_icon_change_selected.xml index 8a915b532f..4f6293787e 100644 --- a/container/testdata/apptabs/mobile/change_icon_change_selected.xml +++ b/container/testdata/apptabs/mobile/change_icon_change_selected.xml @@ -14,7 +14,7 @@ - Text1 + Text1 diff --git a/container/testdata/apptabs/mobile/change_icon_change_unselected.xml b/container/testdata/apptabs/mobile/change_icon_change_unselected.xml index 8a915b532f..4f6293787e 100644 --- a/container/testdata/apptabs/mobile/change_icon_change_unselected.xml +++ b/container/testdata/apptabs/mobile/change_icon_change_unselected.xml @@ -14,7 +14,7 @@ - Text1 + Text1 diff --git a/container/testdata/apptabs/mobile/change_icon_initial.xml b/container/testdata/apptabs/mobile/change_icon_initial.xml index 8a915b532f..4f6293787e 100644 --- a/container/testdata/apptabs/mobile/change_icon_initial.xml +++ b/container/testdata/apptabs/mobile/change_icon_initial.xml @@ -14,7 +14,7 @@ - Text1 + Text1 diff --git a/container/testdata/apptabs/mobile/change_label_change_selected.xml b/container/testdata/apptabs/mobile/change_label_change_selected.xml index 11021626d0..920cea1495 100644 --- a/container/testdata/apptabs/mobile/change_label_change_selected.xml +++ b/container/testdata/apptabs/mobile/change_label_change_selected.xml @@ -1,20 +1,20 @@ - - + + - New 1 + New 1 - Test2 + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/mobile/change_label_change_unselected.xml b/container/testdata/apptabs/mobile/change_label_change_unselected.xml index cb65df5fa3..e7c8c09b49 100644 --- a/container/testdata/apptabs/mobile/change_label_change_unselected.xml +++ b/container/testdata/apptabs/mobile/change_label_change_unselected.xml @@ -1,20 +1,20 @@ - - + + - New 1 + New 1 - New 2 + New 2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/mobile/change_label_initial.xml b/container/testdata/apptabs/mobile/change_label_initial.xml index ac0e9fe250..dac25ac80d 100644 --- a/container/testdata/apptabs/mobile/change_label_initial.xml +++ b/container/testdata/apptabs/mobile/change_label_initial.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 - Test2 + Test2 - - - - Text1 + + + + Text1 diff --git a/container/testdata/apptabs/mobile/dynamic_appended.xml b/container/testdata/apptabs/mobile/dynamic_appended.xml index d9a63190f1..b4a90bcad2 100644 --- a/container/testdata/apptabs/mobile/dynamic_appended.xml +++ b/container/testdata/apptabs/mobile/dynamic_appended.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 Test2 - - - - Text 1 + + + + 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 486346cd48..da794468ed 100644 --- a/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml +++ b/container/testdata/apptabs/mobile/dynamic_appended_and_removed.xml @@ -1,17 +1,17 @@ - - + + - Test2 + Test2 - - - - Text 2 + + + + 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 dfe3a31e06..c7ccbfed05 100644 --- a/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml +++ b/container/testdata/apptabs/mobile/dynamic_appended_another_three.xml @@ -1,26 +1,26 @@ - - + + - Test2 + Test2 - Test3 + Test3 - Test4 + Test4 Test5 - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/apptabs/mobile/dynamic_initial.xml b/container/testdata/apptabs/mobile/dynamic_initial.xml index 0d8f82b1ce..47e7ae4672 100644 --- a/container/testdata/apptabs/mobile/dynamic_initial.xml +++ b/container/testdata/apptabs/mobile/dynamic_initial.xml @@ -1,17 +1,17 @@ - - + + - Test1 + Test1 - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml b/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml index 0caf361654..332f2d361e 100644 --- a/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml +++ b/container/testdata/apptabs/mobile/dynamic_replaced_completely.xml @@ -1,8 +1,8 @@ - - + + Test6 @@ -14,10 +14,10 @@ - - - - Text 6 + + + + Text 6 diff --git a/container/testdata/apptabs/mobile/hover_none.xml b/container/testdata/apptabs/mobile/hover_none.xml index ac0e9fe250..dac25ac80d 100644 --- a/container/testdata/apptabs/mobile/hover_none.xml +++ b/container/testdata/apptabs/mobile/hover_none.xml @@ -1,20 +1,20 @@ - - + + - Test1 + Test1 - Test2 + Test2 - - - - Text1 + + + + Text1 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 3216be1e01..e90dbb53d0 100644 --- a/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml +++ b/container/testdata/apptabs/mobile/layout_bottom_icon_and_text.xml @@ -1,10 +1,10 @@ - - + + - Text1 + Text1 diff --git a/container/testdata/apptabs/mobile/layout_bottom_text.xml b/container/testdata/apptabs/mobile/layout_bottom_text.xml index d6e3c8a923..31df430a91 100644 --- a/container/testdata/apptabs/mobile/layout_bottom_text.xml +++ b/container/testdata/apptabs/mobile/layout_bottom_text.xml @@ -1,10 +1,10 @@ - - + + - Text2 + Text2 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 8569a31b98..c64d33e4bb 100644 --- a/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml +++ b/container/testdata/apptabs/mobile/layout_top_icon_and_text.xml @@ -1,17 +1,17 @@ - - + + - Text1 + Text1 - - - + + + diff --git a/container/testdata/apptabs/mobile/layout_top_text.xml b/container/testdata/apptabs/mobile/layout_top_text.xml index 618defdd2f..802ae0c718 100644 --- a/container/testdata/apptabs/mobile/layout_top_text.xml +++ b/container/testdata/apptabs/mobile/layout_top_text.xml @@ -1,16 +1,16 @@ - - + + - Text2 + Text2 - - - + + + diff --git a/container/testdata/apptabs/mobile/tab_location_bottom.xml b/container/testdata/apptabs/mobile/tab_location_bottom.xml index 16a1c02872..45c4a35064 100644 --- a/container/testdata/apptabs/mobile/tab_location_bottom.xml +++ b/container/testdata/apptabs/mobile/tab_location_bottom.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/mobile/tab_location_top.xml b/container/testdata/apptabs/mobile/tab_location_top.xml index d7c1096d2f..e96ce9c4ff 100644 --- a/container/testdata/apptabs/mobile/tab_location_top.xml +++ b/container/testdata/apptabs/mobile/tab_location_top.xml @@ -1,22 +1,22 @@ - + - - - - - Test1 + + + + + Test1 - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/mobile/tapped_first_selected.xml b/container/testdata/apptabs/mobile/tapped_first_selected.xml index f64302bac8..36697894ee 100644 --- a/container/testdata/apptabs/mobile/tapped_first_selected.xml +++ b/container/testdata/apptabs/mobile/tapped_first_selected.xml @@ -1,23 +1,23 @@ - - + + - Test1 + Test1 - Test2 + Test2 - Test3 + Test3 - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/apptabs/mobile/tapped_second_selected.xml b/container/testdata/apptabs/mobile/tapped_second_selected.xml index 7724a697a6..14274abb46 100644 --- a/container/testdata/apptabs/mobile/tapped_second_selected.xml +++ b/container/testdata/apptabs/mobile/tapped_second_selected.xml @@ -1,23 +1,23 @@ - - + + - Test1 + Test1 - Test2 + Test2 - Test3 + Test3 - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/apptabs/mobile/tapped_third_selected.xml b/container/testdata/apptabs/mobile/tapped_third_selected.xml index 70d18f54d1..a1bb6002e8 100644 --- a/container/testdata/apptabs/mobile/tapped_third_selected.xml +++ b/container/testdata/apptabs/mobile/tapped_third_selected.xml @@ -1,23 +1,23 @@ - - + + - Test1 + Test1 - Test2 + Test2 - Test3 + Test3 - - - - Text 3 + + + + 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 1e55451e19..ec134c8658 100644 --- a/container/testdata/doctabs/desktop/change_content_change_hidden.xml +++ b/container/testdata/doctabs/desktop/change_content_change_hidden.xml @@ -1,29 +1,29 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text3 + + + + Text3 diff --git a/container/testdata/doctabs/desktop/change_content_change_visible.xml b/container/testdata/doctabs/desktop/change_content_change_visible.xml index 1e55451e19..ec134c8658 100644 --- a/container/testdata/doctabs/desktop/change_content_change_visible.xml +++ b/container/testdata/doctabs/desktop/change_content_change_visible.xml @@ -1,29 +1,29 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text3 + + + + Text3 diff --git a/container/testdata/doctabs/desktop/change_content_initial.xml b/container/testdata/doctabs/desktop/change_content_initial.xml index b359c92c0f..122ffbcd92 100644 --- a/container/testdata/doctabs/desktop/change_content_initial.xml +++ b/container/testdata/doctabs/desktop/change_content_initial.xml @@ -1,29 +1,29 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_icon_change_selected.xml b/container/testdata/doctabs/desktop/change_icon_change_selected.xml index 56f7b87b21..5045ca0150 100644 --- a/container/testdata/doctabs/desktop/change_icon_change_selected.xml +++ b/container/testdata/doctabs/desktop/change_icon_change_selected.xml @@ -1,29 +1,29 @@ - - - - + + + + - + - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_icon_change_unselected.xml b/container/testdata/doctabs/desktop/change_icon_change_unselected.xml index 56f7b87b21..5045ca0150 100644 --- a/container/testdata/doctabs/desktop/change_icon_change_unselected.xml +++ b/container/testdata/doctabs/desktop/change_icon_change_unselected.xml @@ -1,29 +1,29 @@ - - - - + + + + - + - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_icon_initial.xml b/container/testdata/doctabs/desktop/change_icon_initial.xml index 56f7b87b21..5045ca0150 100644 --- a/container/testdata/doctabs/desktop/change_icon_initial.xml +++ b/container/testdata/doctabs/desktop/change_icon_initial.xml @@ -1,29 +1,29 @@ - - - - + + + + - + - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_label_change_selected.xml b/container/testdata/doctabs/desktop/change_label_change_selected.xml index cc09a703b6..7e4ecd57c7 100644 --- a/container/testdata/doctabs/desktop/change_label_change_selected.xml +++ b/container/testdata/doctabs/desktop/change_label_change_selected.xml @@ -1,29 +1,29 @@ - - - - - New 1 + + + + + New 1 - - Test2 + + Test2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_label_change_unselected.xml b/container/testdata/doctabs/desktop/change_label_change_unselected.xml index d957098bfe..aaddbb669c 100644 --- a/container/testdata/doctabs/desktop/change_label_change_unselected.xml +++ b/container/testdata/doctabs/desktop/change_label_change_unselected.xml @@ -1,29 +1,29 @@ - - - - - New 1 + + + + + New 1 - - New 2 + + New 2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/change_label_initial.xml b/container/testdata/doctabs/desktop/change_label_initial.xml index b359c92c0f..122ffbcd92 100644 --- a/container/testdata/doctabs/desktop/change_label_initial.xml +++ b/container/testdata/doctabs/desktop/change_label_initial.xml @@ -1,29 +1,29 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/dynamic_appended.xml b/container/testdata/doctabs/desktop/dynamic_appended.xml index 689e03b40e..40021bce33 100644 --- a/container/testdata/doctabs/desktop/dynamic_appended.xml +++ b/container/testdata/doctabs/desktop/dynamic_appended.xml @@ -1,29 +1,29 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - - - Text 1 + + + + 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 49b7c84d5e..7fffa1ad7a 100644 --- a/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml +++ b/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml @@ -1,26 +1,26 @@ - - - - - Test2 + + + + + Test2 - - - + + + - - - - Text 2 + + + + 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 9778934b25..37a2bcbe65 100644 --- a/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml +++ b/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml @@ -1,35 +1,35 @@ - - - - - Test2 + + + + + Test2 - - Test3 + + Test3 - - Test4 + + Test4 - - Test5 + + Test5 - - - + + + - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/doctabs/desktop/dynamic_initial.xml b/container/testdata/doctabs/desktop/dynamic_initial.xml index cc2a85c9d6..c2e8b1e5a4 100644 --- a/container/testdata/doctabs/desktop/dynamic_initial.xml +++ b/container/testdata/doctabs/desktop/dynamic_initial.xml @@ -1,26 +1,26 @@ - - - - - Test1 + + + + + Test1 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml b/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml index 5d2497878b..93fbfa7b3b 100644 --- a/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml +++ b/container/testdata/doctabs/desktop/dynamic_replaced_completely.xml @@ -1,32 +1,32 @@ - - - - - Test6 + + + + + Test6 - - Test7 + + Test7 - - Test8 + + Test8 - - - + + + - - - - Text 6 + + + + Text 6 diff --git a/container/testdata/doctabs/desktop/hover_all_tabs.xml b/container/testdata/doctabs/desktop/hover_all_tabs.xml index 314b2f6cee..3f645ce1f1 100644 --- a/container/testdata/doctabs/desktop/hover_all_tabs.xml +++ b/container/testdata/doctabs/desktop/hover_all_tabs.xml @@ -1,34 +1,34 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/hover_create_tab.xml b/container/testdata/doctabs/desktop/hover_create_tab.xml index a1500a7e90..d098e6dc80 100644 --- a/container/testdata/doctabs/desktop/hover_create_tab.xml +++ b/container/testdata/doctabs/desktop/hover_create_tab.xml @@ -1,34 +1,34 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/hover_first.xml b/container/testdata/doctabs/desktop/hover_first.xml index 4be6a11db7..7ab1fc06fc 100644 --- a/container/testdata/doctabs/desktop/hover_first.xml +++ b/container/testdata/doctabs/desktop/hover_first.xml @@ -1,38 +1,38 @@ - - - - - - Test1 - + + + + + + Test1 + - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/hover_first_close.xml b/container/testdata/doctabs/desktop/hover_first_close.xml index a1500a7e90..d098e6dc80 100644 --- a/container/testdata/doctabs/desktop/hover_first_close.xml +++ b/container/testdata/doctabs/desktop/hover_first_close.xml @@ -1,34 +1,34 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/hover_none.xml b/container/testdata/doctabs/desktop/hover_none.xml index 682a7007bc..611730180b 100644 --- a/container/testdata/doctabs/desktop/hover_none.xml +++ b/container/testdata/doctabs/desktop/hover_none.xml @@ -1,34 +1,34 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/hover_second.xml b/container/testdata/doctabs/desktop/hover_second.xml index a1500a7e90..d098e6dc80 100644 --- a/container/testdata/doctabs/desktop/hover_second.xml +++ b/container/testdata/doctabs/desktop/hover_second.xml @@ -1,34 +1,34 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - - + + + - - + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/desktop/layout_bottom_icon.xml b/container/testdata/doctabs/desktop/layout_bottom_icon.xml index bc5edc1dbf..bc17243e5a 100644 --- a/container/testdata/doctabs/desktop/layout_bottom_icon.xml +++ b/container/testdata/doctabs/desktop/layout_bottom_icon.xml @@ -1,17 +1,17 @@ - - - - + + + + - - - + + + 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 6ec54ec7d4..cb8b04d699 100644 --- a/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml +++ b/container/testdata/doctabs/desktop/layout_bottom_icon_and_text.xml @@ -1,25 +1,25 @@ - - - - - Text1 + + + + + Text1 - - - + + + - + diff --git a/container/testdata/doctabs/desktop/layout_bottom_text.xml b/container/testdata/doctabs/desktop/layout_bottom_text.xml index feec19efeb..99561f6e7a 100644 --- a/container/testdata/doctabs/desktop/layout_bottom_text.xml +++ b/container/testdata/doctabs/desktop/layout_bottom_text.xml @@ -1,24 +1,24 @@ - - - - - Text2 + + + + + Text2 - - - + + + - + diff --git a/container/testdata/doctabs/desktop/layout_leading_icon.xml b/container/testdata/doctabs/desktop/layout_leading_icon.xml index 568b0992c6..c98cf43493 100644 --- a/container/testdata/doctabs/desktop/layout_leading_icon.xml +++ b/container/testdata/doctabs/desktop/layout_leading_icon.xml @@ -9,9 +9,9 @@ - - - + + + 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 43112752dc..e71b327284 100644 --- a/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml +++ b/container/testdata/doctabs/desktop/layout_leading_icon_and_text.xml @@ -1,26 +1,26 @@ - - - - - Text1 - + + + + + Text1 + - - - + + + - - - + + + diff --git a/container/testdata/doctabs/desktop/layout_leading_text.xml b/container/testdata/doctabs/desktop/layout_leading_text.xml index 855935e460..3f3fd4388b 100644 --- a/container/testdata/doctabs/desktop/layout_leading_text.xml +++ b/container/testdata/doctabs/desktop/layout_leading_text.xml @@ -1,25 +1,25 @@ - - - - - Text2 + + + + + Text2 - - - + + + - - - + + + diff --git a/container/testdata/doctabs/desktop/layout_top_icon.xml b/container/testdata/doctabs/desktop/layout_top_icon.xml index 5cc0ee68bf..d7f8a55290 100644 --- a/container/testdata/doctabs/desktop/layout_top_icon.xml +++ b/container/testdata/doctabs/desktop/layout_top_icon.xml @@ -1,25 +1,25 @@ - - - - + + + + - - - + + + - - - + + + 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 da31e52343..f7f58ef1a5 100644 --- a/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml +++ b/container/testdata/doctabs/desktop/layout_top_icon_and_text.xml @@ -1,26 +1,26 @@ - - - - - Text1 + + + + + Text1 - - - + + + - - - + + + diff --git a/container/testdata/doctabs/desktop/layout_top_text.xml b/container/testdata/doctabs/desktop/layout_top_text.xml index 9b896b32aa..32bb2ca8de 100644 --- a/container/testdata/doctabs/desktop/layout_top_text.xml +++ b/container/testdata/doctabs/desktop/layout_top_text.xml @@ -1,25 +1,25 @@ - - - - - Text2 + + + + + Text2 - - - + + + - - - + + + diff --git a/container/testdata/doctabs/desktop/layout_trailing_icon.xml b/container/testdata/doctabs/desktop/layout_trailing_icon.xml index 70d1808e95..be74d5488b 100644 --- a/container/testdata/doctabs/desktop/layout_trailing_icon.xml +++ b/container/testdata/doctabs/desktop/layout_trailing_icon.xml @@ -9,9 +9,9 @@ - - - + + + 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 0225740012..d0587c1490 100644 --- a/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml +++ b/container/testdata/doctabs/desktop/layout_trailing_icon_and_text.xml @@ -1,25 +1,25 @@ - - - - - Text1 - + + + + + Text1 + - - - + + + - + diff --git a/container/testdata/doctabs/desktop/layout_trailing_text.xml b/container/testdata/doctabs/desktop/layout_trailing_text.xml index 2c8a35ef3a..285c933571 100644 --- a/container/testdata/doctabs/desktop/layout_trailing_text.xml +++ b/container/testdata/doctabs/desktop/layout_trailing_text.xml @@ -1,24 +1,24 @@ - - - - - Text2 + + + + + Text2 - - - + + + - + diff --git a/container/testdata/doctabs/desktop/single_custom_theme.png b/container/testdata/doctabs/desktop/single_custom_theme.png index 7197ee627c..5e03b69094 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 48cfcecd16..a0b7e8d39e 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 754e403fa7..fc661582a8 100644 --- a/container/testdata/doctabs/desktop/tab_location_bottom.xml +++ b/container/testdata/doctabs/desktop/tab_location_bottom.xml @@ -1,32 +1,32 @@ - + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/desktop/tab_location_leading.xml b/container/testdata/doctabs/desktop/tab_location_leading.xml index 241e0d0999..fa131d8260 100644 --- a/container/testdata/doctabs/desktop/tab_location_leading.xml +++ b/container/testdata/doctabs/desktop/tab_location_leading.xml @@ -1,31 +1,31 @@ - + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - - Text 1 + + + Text 1 diff --git a/container/testdata/doctabs/desktop/tab_location_top.xml b/container/testdata/doctabs/desktop/tab_location_top.xml index 7bea301c58..2a82501d4f 100644 --- a/container/testdata/doctabs/desktop/tab_location_top.xml +++ b/container/testdata/doctabs/desktop/tab_location_top.xml @@ -1,32 +1,32 @@ - + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/desktop/tab_location_trailing.xml b/container/testdata/doctabs/desktop/tab_location_trailing.xml index afb835ef7e..fcab7dbc83 100644 --- a/container/testdata/doctabs/desktop/tab_location_trailing.xml +++ b/container/testdata/doctabs/desktop/tab_location_trailing.xml @@ -1,31 +1,31 @@ - + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - - Text 1 + + + Text 1 diff --git a/container/testdata/doctabs/desktop/tapped_all_tabs.xml b/container/testdata/doctabs/desktop/tapped_all_tabs.xml index 4b43f9313e..941e310eca 100644 --- a/container/testdata/doctabs/desktop/tapped_all_tabs.xml +++ b/container/testdata/doctabs/desktop/tapped_all_tabs.xml @@ -1,81 +1,81 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - Another + + Another - - - - + + + + - - - + + + - - - - Another Tab + + + + Another Tab - - + + - - - - - + + + + + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - Another + + Another - - - + + + - - + + diff --git a/container/testdata/doctabs/desktop/tapped_create_tab.xml b/container/testdata/doctabs/desktop/tapped_create_tab.xml index 4973166839..8d9d339c03 100644 --- a/container/testdata/doctabs/desktop/tapped_create_tab.xml +++ b/container/testdata/doctabs/desktop/tapped_create_tab.xml @@ -1,40 +1,40 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - Another + + Another - - - - + + + + - - + + - - - - Another Tab + + + + Another Tab diff --git a/container/testdata/doctabs/desktop/tapped_first_selected.xml b/container/testdata/doctabs/desktop/tapped_first_selected.xml index 57c1125896..b30dfcfc62 100644 --- a/container/testdata/doctabs/desktop/tapped_first_selected.xml +++ b/container/testdata/doctabs/desktop/tapped_first_selected.xml @@ -1,37 +1,37 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/desktop/tapped_second_selected.xml b/container/testdata/doctabs/desktop/tapped_second_selected.xml index 4f7353cd9d..74b71ac774 100644 --- a/container/testdata/doctabs/desktop/tapped_second_selected.xml +++ b/container/testdata/doctabs/desktop/tapped_second_selected.xml @@ -1,37 +1,37 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - + + - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/doctabs/desktop/tapped_third_selected.xml b/container/testdata/doctabs/desktop/tapped_third_selected.xml index 8de614f68d..5bdf984186 100644 --- a/container/testdata/doctabs/desktop/tapped_third_selected.xml +++ b/container/testdata/doctabs/desktop/tapped_third_selected.xml @@ -1,37 +1,37 @@ - - - - - Test1 + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - - + + + - - + + - - - - Text 3 + + + + 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 8a35d45473..07ea42864f 100644 --- a/container/testdata/doctabs/mobile/change_content_change_hidden.xml +++ b/container/testdata/doctabs/mobile/change_content_change_hidden.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - - + + + - - - - Text3 + + + + Text3 diff --git a/container/testdata/doctabs/mobile/change_content_change_visible.xml b/container/testdata/doctabs/mobile/change_content_change_visible.xml index 8a35d45473..07ea42864f 100644 --- a/container/testdata/doctabs/mobile/change_content_change_visible.xml +++ b/container/testdata/doctabs/mobile/change_content_change_visible.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - - + + + - - - - Text3 + + + + Text3 diff --git a/container/testdata/doctabs/mobile/change_content_initial.xml b/container/testdata/doctabs/mobile/change_content_initial.xml index 4ab7478323..5930d26873 100644 --- a/container/testdata/doctabs/mobile/change_content_initial.xml +++ b/container/testdata/doctabs/mobile/change_content_initial.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_change_selected.xml b/container/testdata/doctabs/mobile/change_icon_change_selected.xml index aa00d5438d..f60d8d3d31 100644 --- a/container/testdata/doctabs/mobile/change_icon_change_selected.xml +++ b/container/testdata/doctabs/mobile/change_icon_change_selected.xml @@ -29,7 +29,7 @@ - Text1 + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml index aa00d5438d..f60d8d3d31 100644 --- a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml +++ b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml @@ -29,7 +29,7 @@ - Text1 + Text1 diff --git a/container/testdata/doctabs/mobile/change_icon_initial.xml b/container/testdata/doctabs/mobile/change_icon_initial.xml index aa00d5438d..f60d8d3d31 100644 --- a/container/testdata/doctabs/mobile/change_icon_initial.xml +++ b/container/testdata/doctabs/mobile/change_icon_initial.xml @@ -29,7 +29,7 @@ - Text1 + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_change_selected.xml b/container/testdata/doctabs/mobile/change_label_change_selected.xml index 821759fad9..f512f27dfe 100644 --- a/container/testdata/doctabs/mobile/change_label_change_selected.xml +++ b/container/testdata/doctabs/mobile/change_label_change_selected.xml @@ -1,35 +1,35 @@ - - - + + + - New 1 + New 1 - Test2 + Test2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_change_unselected.xml b/container/testdata/doctabs/mobile/change_label_change_unselected.xml index 8c746499dd..b1389c294a 100644 --- a/container/testdata/doctabs/mobile/change_label_change_unselected.xml +++ b/container/testdata/doctabs/mobile/change_label_change_unselected.xml @@ -1,35 +1,35 @@ - - - + + + - New 1 + New 1 - New 2 + New 2 - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/mobile/change_label_initial.xml b/container/testdata/doctabs/mobile/change_label_initial.xml index 4ab7478323..5930d26873 100644 --- a/container/testdata/doctabs/mobile/change_label_initial.xml +++ b/container/testdata/doctabs/mobile/change_label_initial.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - - + + + - - - - Text1 + + + + Text1 diff --git a/container/testdata/doctabs/mobile/dynamic_appended.xml b/container/testdata/doctabs/mobile/dynamic_appended.xml index 8cf9e031c6..a3e5cdf522 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - Test2 + Test2 - - - + + + - - - - Text 1 + + + + 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 ce7a2c8869..02746daca4 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml @@ -1,29 +1,29 @@ - - - + + + - Test2 + Test2 - - - + + + - - - - Text 2 + + + + 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 69e72064cb..90d9c1709b 100644 --- a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml +++ b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml @@ -1,47 +1,47 @@ - - - + + + - Test2 + Test2 - - Test3 - + + Test3 + - - Test4 + + Test4 - - Test5 - + + Test5 + - - - + + + - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/doctabs/mobile/dynamic_initial.xml b/container/testdata/doctabs/mobile/dynamic_initial.xml index ac3a2cf0af..45fd539972 100644 --- a/container/testdata/doctabs/mobile/dynamic_initial.xml +++ b/container/testdata/doctabs/mobile/dynamic_initial.xml @@ -1,29 +1,29 @@ - - - + + + - Test1 + Test1 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml index 1ec4df60ab..a84586bf7f 100644 --- a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml +++ b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml @@ -1,41 +1,41 @@ - - - + + + - Test6 + Test6 - Test7 + Test7 - Test8 + Test8 - - - + + + - - - - Text 6 + + + + Text 6 diff --git a/container/testdata/doctabs/mobile/hover_none.xml b/container/testdata/doctabs/mobile/hover_none.xml index 468d3144ed..c37a22215f 100644 --- a/container/testdata/doctabs/mobile/hover_none.xml +++ b/container/testdata/doctabs/mobile/hover_none.xml @@ -1,35 +1,35 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - - + + + - - - - Text1 + + + + Text1 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 efa0bc63d0..619d016cc4 100644 --- a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml +++ b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml @@ -1,11 +1,11 @@ - - - + + + - Text1 + Text1 @@ -13,9 +13,9 @@ - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_bottom_text.xml b/container/testdata/doctabs/mobile/layout_bottom_text.xml index ead7a1c352..fed267af6e 100644 --- a/container/testdata/doctabs/mobile/layout_bottom_text.xml +++ b/container/testdata/doctabs/mobile/layout_bottom_text.xml @@ -1,20 +1,20 @@ - - - + + + - Text2 + Text2 - - - + + + 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 607128f5a8..1e3816d82a 100644 --- a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml +++ b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml @@ -1,11 +1,11 @@ - - - + + + - Text1 + Text1 @@ -13,17 +13,17 @@ - - - + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/layout_top_text.xml b/container/testdata/doctabs/mobile/layout_top_text.xml index 5bc21c3886..df24f74b32 100644 --- a/container/testdata/doctabs/mobile/layout_top_text.xml +++ b/container/testdata/doctabs/mobile/layout_top_text.xml @@ -1,28 +1,28 @@ - - - + + + - Text2 + Text2 - - - + + + - - - + + + diff --git a/container/testdata/doctabs/mobile/tab_location_bottom.xml b/container/testdata/doctabs/mobile/tab_location_bottom.xml index 223e60873b..2b333d9124 100644 --- a/container/testdata/doctabs/mobile/tab_location_bottom.xml +++ b/container/testdata/doctabs/mobile/tab_location_bottom.xml @@ -1,41 +1,41 @@ - + - - - - + + + + - Test1 + Test1 - - Test2 - + + Test2 + - - Test3 + + Test3 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/mobile/tab_location_top.xml b/container/testdata/doctabs/mobile/tab_location_top.xml index 749903887a..17572302e8 100644 --- a/container/testdata/doctabs/mobile/tab_location_top.xml +++ b/container/testdata/doctabs/mobile/tab_location_top.xml @@ -1,41 +1,41 @@ - + - - - - + + + + - Test1 + Test1 - - Test2 - + + Test2 + - - Test3 + + Test3 - - - + + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml index c93d8874b2..42ae70da91 100644 --- a/container/testdata/doctabs/mobile/tapped_all_tabs.xml +++ b/container/testdata/doctabs/mobile/tapped_all_tabs.xml @@ -1,93 +1,93 @@ - - - - - Test1 - + + + + + Test1 + - - Test2 - + + Test2 + - - Test3 + + Test3 - - Another - + + Another + - - - - + + + + - - - + + + - - - - Another Tab + + + + Another Tab - - + + - - - - - + + + + + - - - - - - Test1 + + + + + + Test1 - - Test2 + + Test2 - - Test3 + + Test3 - - Another + + Another - - - + + + - - + + diff --git a/container/testdata/doctabs/mobile/tapped_create_tab.xml b/container/testdata/doctabs/mobile/tapped_create_tab.xml index 11579bfd83..0f79b52a03 100644 --- a/container/testdata/doctabs/mobile/tapped_create_tab.xml +++ b/container/testdata/doctabs/mobile/tapped_create_tab.xml @@ -1,52 +1,52 @@ - - - - - Test1 - + + + + + Test1 + - - Test2 - + + Test2 + - - Test3 + + Test3 - - Another - + + Another + - - - - + + + + - - + + - - - - Another Tab + + + + Another Tab diff --git a/container/testdata/doctabs/mobile/tapped_first_selected.xml b/container/testdata/doctabs/mobile/tapped_first_selected.xml index 39b61cca87..8786dfd1b1 100644 --- a/container/testdata/doctabs/mobile/tapped_first_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_first_selected.xml @@ -1,46 +1,46 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - Test3 + + Test3 - - - + + + - - + + - - - - Text 1 + + + + Text 1 diff --git a/container/testdata/doctabs/mobile/tapped_second_selected.xml b/container/testdata/doctabs/mobile/tapped_second_selected.xml index 9d00013e6c..683bb673b2 100644 --- a/container/testdata/doctabs/mobile/tapped_second_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_second_selected.xml @@ -1,46 +1,46 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - Test3 + + Test3 - - - + + + - - + + - - - - Text 2 + + + + Text 2 diff --git a/container/testdata/doctabs/mobile/tapped_third_selected.xml b/container/testdata/doctabs/mobile/tapped_third_selected.xml index 2551eae860..04c0c58f9f 100644 --- a/container/testdata/doctabs/mobile/tapped_third_selected.xml +++ b/container/testdata/doctabs/mobile/tapped_third_selected.xml @@ -1,46 +1,46 @@ - - - + + + - Test1 + Test1 - - Test2 - + + Test2 + - - Test3 + + Test3 - - - + + + - - + + - - - - Text 3 + + + + Text 3 diff --git a/container/testdata/doctabs/mobile/theme_default.png b/container/testdata/doctabs/mobile/theme_default.png index f8fb6329c9..ee906fd0ea 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 288b598349..3f30bd5914 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/color/channel_layout_foobar_0.png b/dialog/testdata/color/channel_layout_foobar_0.png index 82c8d5cac2..119288f17d 100644 Binary files a/dialog/testdata/color/channel_layout_foobar_0.png and b/dialog/testdata/color/channel_layout_foobar_0.png differ diff --git a/dialog/testdata/color/channel_layout_foobar_100.png b/dialog/testdata/color/channel_layout_foobar_100.png index b5cdd2bd02..fd5c0d8625 100644 Binary files a/dialog/testdata/color/channel_layout_foobar_100.png and b/dialog/testdata/color/channel_layout_foobar_100.png differ diff --git a/dialog/testdata/color/channel_layout_foobar_50.png b/dialog/testdata/color/channel_layout_foobar_50.png index bf91a8d4a7..375fc8ef11 100644 Binary files a/dialog/testdata/color/channel_layout_foobar_50.png and b/dialog/testdata/color/channel_layout_foobar_50.png differ diff --git a/dialog/testdata/color/dialog_expanded_theme_default.png b/dialog/testdata/color/dialog_expanded_theme_default.png index e1b971b9d8..6aaca0f844 100644 Binary files a/dialog/testdata/color/dialog_expanded_theme_default.png and b/dialog/testdata/color/dialog_expanded_theme_default.png differ diff --git a/dialog/testdata/color/dialog_expanded_theme_ugly.png b/dialog/testdata/color/dialog_expanded_theme_ugly.png index 6aee51f17f..e49cbc43ee 100644 Binary files a/dialog/testdata/color/dialog_expanded_theme_ugly.png and b/dialog/testdata/color/dialog_expanded_theme_ugly.png differ diff --git a/dialog/testdata/color/dialog_recents_theme_default.png b/dialog/testdata/color/dialog_recents_theme_default.png index 8b953b592d..db15fc2d62 100644 Binary files a/dialog/testdata/color/dialog_recents_theme_default.png and b/dialog/testdata/color/dialog_recents_theme_default.png differ diff --git a/dialog/testdata/color/dialog_recents_theme_ugly.png b/dialog/testdata/color/dialog_recents_theme_ugly.png index cb87b52444..01459f41bb 100644 Binary files a/dialog/testdata/color/dialog_recents_theme_ugly.png and b/dialog/testdata/color/dialog_recents_theme_ugly.png differ diff --git a/dialog/testdata/color/dialog_simple_recents_theme_default.png b/dialog/testdata/color/dialog_simple_recents_theme_default.png index f9a3c62aea..01b81c6a64 100644 Binary files a/dialog/testdata/color/dialog_simple_recents_theme_default.png and b/dialog/testdata/color/dialog_simple_recents_theme_default.png differ diff --git a/dialog/testdata/color/dialog_simple_recents_theme_ugly.png b/dialog/testdata/color/dialog_simple_recents_theme_ugly.png index daf24e6a55..89dd8ca7a7 100644 Binary files a/dialog/testdata/color/dialog_simple_recents_theme_ugly.png and b/dialog/testdata/color/dialog_simple_recents_theme_ugly.png differ diff --git a/dialog/testdata/color/dialog_simple_theme_default.png b/dialog/testdata/color/dialog_simple_theme_default.png index 3baca7bce2..7358321b35 100644 Binary files a/dialog/testdata/color/dialog_simple_theme_default.png and b/dialog/testdata/color/dialog_simple_theme_default.png differ diff --git a/dialog/testdata/color/dialog_simple_theme_ugly.png b/dialog/testdata/color/dialog_simple_theme_ugly.png index 3b5e5761d0..4080f5bf57 100644 Binary files a/dialog/testdata/color/dialog_simple_theme_ugly.png and b/dialog/testdata/color/dialog_simple_theme_ugly.png differ diff --git a/dialog/testdata/color/dialog_theme_default.png b/dialog/testdata/color/dialog_theme_default.png index 6cefb98ae4..77adf3a61b 100644 Binary files a/dialog/testdata/color/dialog_theme_default.png and b/dialog/testdata/color/dialog_theme_default.png differ diff --git a/dialog/testdata/color/dialog_theme_ugly.png b/dialog/testdata/color/dialog_theme_ugly.png index 7f245b8f82..cc1209c74b 100644 Binary files a/dialog/testdata/color/dialog_theme_ugly.png and b/dialog/testdata/color/dialog_theme_ugly.png differ diff --git a/dialog/testdata/color/picker_layout_advanced.png b/dialog/testdata/color/picker_layout_advanced.png index 8fbf5a8223..30b760240e 100644 Binary files a/dialog/testdata/color/picker_layout_advanced.png and b/dialog/testdata/color/picker_layout_advanced.png differ diff --git a/dialog/testdata/dialog-custom-default.png b/dialog/testdata/dialog-custom-default.png index 7628832dc4..7606e885d3 100644 Binary files a/dialog/testdata/dialog-custom-default.png and b/dialog/testdata/dialog-custom-default.png differ diff --git a/dialog/testdata/dialog-custom-ugly.png b/dialog/testdata/dialog-custom-ugly.png index 5e2902112e..1779cc68b0 100644 Binary files a/dialog/testdata/dialog-custom-ugly.png and b/dialog/testdata/dialog-custom-ugly.png differ diff --git a/dialog/testdata/dialog-onshow-theme-changed.png b/dialog/testdata/dialog-onshow-theme-changed.png index 22efc078b0..7fb0b51c08 100644 Binary files a/dialog/testdata/dialog-onshow-theme-changed.png and b/dialog/testdata/dialog-onshow-theme-changed.png differ diff --git a/dialog/testdata/dialog-onshow-theme-default.png b/dialog/testdata/dialog-onshow-theme-default.png index 41656afc21..c6f335233c 100644 Binary files a/dialog/testdata/dialog-onshow-theme-default.png and b/dialog/testdata/dialog-onshow-theme-default.png differ diff --git a/driver.go b/driver.go index b9be762885..8737f69148 100644 --- a/driver.go +++ b/driver.go @@ -9,8 +9,8 @@ type Driver interface { AllWindows() []Window // RenderedTextSize returns the size required to render the given string of specified - // font size and style. - RenderedTextSize(string, float32, TextStyle) Size + // font size and style. It also returns the height to text baseline, measured from the top. + RenderedTextSize(text string, fontSize float32, style TextStyle) (size Size, baseline float32) // CanvasForObject returns the canvas that is associated with a given CanvasObject. CanvasForObject(CanvasObject) Canvas diff --git a/driver/software/testdata/button.png b/driver/software/testdata/button.png index 3dde207a60..066d056fd8 100644 Binary files a/driver/software/testdata/button.png and b/driver/software/testdata/button.png differ diff --git a/driver/software/testdata/button_important.png b/driver/software/testdata/button_important.png index ddd2457b9d..3f73237bc6 100644 Binary files a/driver/software/testdata/button_important.png and b/driver/software/testdata/button_important.png differ diff --git a/driver/software/testdata/canvas.png b/driver/software/testdata/canvas.png index b87861e12f..c5f4bab5ee 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 4d1b2d9729..ea423202ae 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/label_dark.png b/driver/software/testdata/label_dark.png index b86bcfeee5..1419a5791b 100644 Binary files a/driver/software/testdata/label_dark.png and b/driver/software/testdata/label_dark.png differ diff --git a/driver/software/testdata/label_light.png b/driver/software/testdata/label_light.png index bd966f4d5d..e959d955ac 100644 Binary files a/driver/software/testdata/label_light.png and b/driver/software/testdata/label_light.png differ diff --git a/internal/cache/base.go b/internal/cache/base.go index ff0982df38..a554c7ec97 100644 --- a/internal/cache/base.go +++ b/internal/cache/base.go @@ -93,6 +93,17 @@ func CleanCanvas(canvas fyne.Canvas) { renderersLock.Unlock() } +// ResetThemeCaches clears all the svg and text size cache maps +func ResetThemeCaches() { + svgLock.Lock() + svgs = make(map[string]*svgInfo) + svgLock.Unlock() + + fontSizeLock.Lock() + fontSizeCache = map[fontSizeEntry]fontMetric{} + fontSizeLock.Unlock() +} + // destroyExpiredCanvases deletes objects from the canvases cache. func destroyExpiredCanvases(now time.Time) { expiredObjects = expiredObjects[:0] @@ -135,25 +146,6 @@ func destroyExpiredRenderers(now time.Time) { } } -// destroyExpiredSvgs destroys expired svgs cache data. -func destroyExpiredSvgs(now time.Time) { - expiredSvgs := make([]string, 0, 20) - svgLock.RLock() - for s, sinfo := range svgs { - if sinfo.isExpired(now) { - expiredSvgs = append(expiredSvgs, s) - } - } - svgLock.RUnlock() - if len(expiredSvgs) > 0 { - svgLock.Lock() - for _, exp := range expiredSvgs { - delete(svgs, exp) - } - svgLock.Unlock() - } -} - type expiringCache struct { expireLock sync.RWMutex expires time.Time diff --git a/internal/cache/svg.go b/internal/cache/svg.go index d479154a2b..4ce5941530 100644 --- a/internal/cache/svg.go +++ b/internal/cache/svg.go @@ -3,6 +3,7 @@ package cache import ( "image" "sync" + "time" ) var svgLock sync.RWMutex @@ -20,13 +21,6 @@ func GetSvg(name string, w int, h int) *image.NRGBA { return sinfo.pix } -// ResetSvg clears all the svg cache map -func ResetSvg() { - svgLock.Lock() - svgs = make(map[string]*svgInfo) - svgLock.Unlock() -} - // SetSvg sets a svg into the cache map. func SetSvg(name string, pix *image.NRGBA, w int, h int) { sinfo := &svgInfo{ @@ -45,3 +39,22 @@ type svgInfo struct { pix *image.NRGBA w, h int } + +// destroyExpiredSvgs destroys expired svgs cache data. +func destroyExpiredSvgs(now time.Time) { + expiredSvgs := make([]string, 0, 20) + svgLock.RLock() + for s, sinfo := range svgs { + if sinfo.isExpired(now) { + expiredSvgs = append(expiredSvgs, s) + } + } + svgLock.RUnlock() + if len(expiredSvgs) > 0 { + svgLock.Lock() + for _, exp := range expiredSvgs { + delete(svgs, exp) + } + svgLock.Unlock() + } +} diff --git a/internal/cache/svg_test.go b/internal/cache/svg_test.go index cc5d9da7bb..f04276db91 100644 --- a/internal/cache/svg_test.go +++ b/internal/cache/svg_test.go @@ -10,7 +10,7 @@ import ( ) func TestSvgCacheGet(t *testing.T) { - ResetSvg() + ResetThemeCaches() img := addToCache("empty.svg", "", 25, 25) assert.Equal(t, 1, len(svgs)) @@ -24,7 +24,7 @@ func TestSvgCacheGet(t *testing.T) { } func TestSvgCacheGet_File(t *testing.T) { - ResetSvg() + ResetThemeCaches() img := addFileToCache("testdata/stroke.svg", 25, 25) assert.Equal(t, 1, len(svgs)) @@ -38,11 +38,11 @@ func TestSvgCacheGet_File(t *testing.T) { } func TestSvgCacheReset(t *testing.T) { - ResetSvg() + ResetThemeCaches() _ = addToCache("empty.svg", "", 25, 25) assert.Equal(t, 1, len(svgs)) - ResetSvg() + ResetThemeCaches() assert.Equal(t, 0, len(svgs)) } diff --git a/internal/cache/text.go b/internal/cache/text.go new file mode 100644 index 0000000000..1b451223d0 --- /dev/null +++ b/internal/cache/text.go @@ -0,0 +1,43 @@ +package cache + +import ( + "sync" + + "fyne.io/fyne/v2" +) + +var ( + fontSizeCache = map[fontSizeEntry]fontMetric{} + fontSizeLock = sync.RWMutex{} +) + +type fontMetric struct { + size fyne.Size + baseLine float32 +} + +type fontSizeEntry struct { + text string + size float32 + style fyne.TextStyle +} + +// GetFontMetrics looks up a calculated size and baseline required for the specified text parameters. +func GetFontMetrics(text string, fontSize float32, style fyne.TextStyle) (size fyne.Size, base float32) { + ent := fontSizeEntry{text, fontSize, style} + fontSizeLock.RLock() + ret, ok := fontSizeCache[ent] + fontSizeLock.RUnlock() + if !ok { + return fyne.Size{Width: 0, Height: 0}, 0 + } + return ret.size, ret.baseLine +} + +// SetFontMetrics stores a calculated font size and baseline for parameters that were missing from the cache. +func SetFontMetrics(text string, fontSize float32, style fyne.TextStyle, size fyne.Size, base float32) { + ent := fontSizeEntry{text, fontSize, style} + fontSizeLock.Lock() + fontSizeCache[ent] = fontMetric{size: size, baseLine: base} + fontSizeLock.Unlock() +} diff --git a/internal/cache/text_test.go b/internal/cache/text_test.go new file mode 100644 index 0000000000..4c2635fcf0 --- /dev/null +++ b/internal/cache/text_test.go @@ -0,0 +1,24 @@ +package cache + +import ( + "testing" + + "fyne.io/fyne/v2" + "github.com/stretchr/testify/assert" +) + +func TestTextCacheGet(t *testing.T) { + ResetThemeCaches() + assert.Equal(t, 0, len(fontSizeCache)) + + bound, base := GetFontMetrics("hi", 10, fyne.TextStyle{}) + assert.True(t, bound.IsZero()) + assert.Equal(t, float32(0), base) + + SetFontMetrics("hi", 10, fyne.TextStyle{}, fyne.NewSize(10, 10), 8) + assert.Equal(t, 1, len(fontSizeCache)) + + bound, base = GetFontMetrics("hi", 10, fyne.TextStyle{}) + assert.Equal(t, fyne.NewSize(10, 10), bound) + assert.Equal(t, float32(8), base) +} diff --git a/internal/driver/glfw/driver.go b/internal/driver/glfw/driver.go index 2252aa26e3..9a6647b945 100644 --- a/internal/driver/glfw/driver.go +++ b/internal/driver/glfw/driver.go @@ -39,8 +39,8 @@ type gLDriver struct { animation *animation.Runner } -func (d *gLDriver) RenderedTextSize(text string, size float32, style fyne.TextStyle) fyne.Size { - return painter.RenderedTextSize(text, size, style) +func (d *gLDriver) RenderedTextSize(text string, textSize float32, style fyne.TextStyle) (size fyne.Size, baseline float32) { + return painter.RenderedTextSize(text, textSize, style) } func (d *gLDriver) CanvasForObject(obj fyne.CanvasObject) fyne.Canvas { diff --git a/internal/driver/glfw/driver_test.go b/internal/driver/glfw/driver_test.go index 274213479f..5d0b2ac590 100644 --- a/internal/driver/glfw/driver_test.go +++ b/internal/driver/glfw/driver_test.go @@ -64,47 +64,57 @@ func Test_gLDriver_AbsolutePositionForObject(t *testing.T) { m2 := mbarCont.Objects[1] tests := map[string]struct { - object fyne.CanvasObject - want fyne.Position + object fyne.CanvasObject + wantX, wantY int }{ "a cell": { object: cr1c3, - want: fyne.NewPos(198, 33), + wantX: 197, + wantY: 32, }, "a row": { object: cr2, - want: fyne.NewPos(4, 74), + wantX: 4, + wantY: 73, }, "the window content": { object: content, - want: fyne.NewPos(4, 33), + wantX: 4, + wantY: 32, }, "a hidden element": { object: cr2c2, - want: fyne.NewPos(0, 0), + wantX: 0, + wantY: 0, }, "a menu": { object: m2, - want: fyne.NewPos(78, 0), + wantX: 77, + wantY: 0, }, "an overlay item": { object: ovli2, - want: fyne.NewPos(87, 81), + wantX: 87, + wantY: 81, }, "the overlay content": { object: ovlContent, - want: fyne.NewPos(87, 40), + wantX: 87, + wantY: 40, }, "the overlay": { object: ovl, - want: fyne.NewPos(0, 0), + wantX: 0, + wantY: 0, }, } for name, tt := range tests { t.Run(name, func(t *testing.T) { - assert.Equal(t, tt.want, d.AbsolutePositionForObject(tt.object)) + pos := d.AbsolutePositionForObject(tt.object) + assert.Equal(t, tt.wantX, int(pos.X)) + assert.Equal(t, tt.wantY, int(pos.Y)) }) } } diff --git a/internal/driver/glfw/loop.go b/internal/driver/glfw/loop.go index 0391288d2b..412c857b71 100644 --- a/internal/driver/glfw/loop.go +++ b/internal/driver/glfw/loop.go @@ -200,7 +200,7 @@ func (d *gLDriver) startDrawThread() { } case set := <-settingsChange: painter.ClearFontCache() - cache.ResetSvg() + cache.ResetThemeCaches() app.ApplySettingsWithCallback(set, fyne.CurrentApp(), func(w fyne.Window) { c, ok := w.Canvas().(*glCanvas) if !ok { diff --git a/internal/driver/glfw/testdata/menu_bar_active_edit.png b/internal/driver/glfw/testdata/menu_bar_active_edit.png index c91c690ff4..81b19e4e9e 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_active_edit.png and b/internal/driver/glfw/testdata/menu_bar_active_edit.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_active_file.png b/internal/driver/glfw/testdata/menu_bar_active_file.png index 24667cfd5f..7e2f5e80eb 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_active_file.png and b/internal/driver/glfw/testdata/menu_bar_active_file.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_active_help.png b/internal/driver/glfw/testdata/menu_bar_active_help.png index 9423891e19..aa6d6d174e 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_active_help.png and b/internal/driver/glfw/testdata/menu_bar_active_help.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_content_not_hoverable_with_active_menu.png b/internal/driver/glfw/testdata/menu_bar_content_not_hoverable_with_active_menu.png index 24667cfd5f..7e2f5e80eb 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_content_not_hoverable_with_active_menu.png and b/internal/driver/glfw/testdata/menu_bar_content_not_hoverable_with_active_menu.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_content.png b/internal/driver/glfw/testdata/menu_bar_hovered_content.png index 270e93b72f..3675a1aabc 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_content.png and b/internal/driver/glfw/testdata/menu_bar_hovered_content.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_content_test_theme.png b/internal/driver/glfw/testdata/menu_bar_hovered_content_test_theme.png index acaa202a79..00ea69ae59 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_content_test_theme.png and b/internal/driver/glfw/testdata/menu_bar_hovered_content_test_theme.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_file_new.png b/internal/driver/glfw/testdata/menu_bar_hovered_file_new.png index 4d598a4bc2..42fcb21594 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_file_new.png and b/internal/driver/glfw/testdata/menu_bar_hovered_file_new.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_file_open.png b/internal/driver/glfw/testdata/menu_bar_hovered_file_open.png index db6633f6e7..7b2b838b18 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_file_open.png and b/internal/driver/glfw/testdata/menu_bar_hovered_file_open.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent.png b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent.png index 7d33bd55d1..06e4252c35 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent.png and b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older.png b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older.png index 1d151e16e9..b1d188eb07 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older.png and b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older_old1.png b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older_old1.png index db7f2d0f69..ff460cd237 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older_old1.png and b/internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older_old1.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_inactive_file.png b/internal/driver/glfw/testdata/menu_bar_inactive_file.png index 744dd29710..126e1e701d 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_inactive_file.png and b/internal/driver/glfw/testdata/menu_bar_inactive_file.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_initial.png b/internal/driver/glfw/testdata/menu_bar_initial.png index 270e93b72f..3675a1aabc 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_initial.png and b/internal/driver/glfw/testdata/menu_bar_initial.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_1.xml index 8b1640edac..2c3bb82609 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_1.xml @@ -1,89 +1,89 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - - Recent - + + + Recent + - - + + - - - - - - - + + + + + + + - - - - - - File 1 + + + + + + File 1 - - File 2 + + File 2 - - - Older - + + + Older + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_2.xml index 42ede5dd40..642875f4d0 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_2.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - - Recent - + + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_1.xml index 3476b7be1e..d42d897244 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_1.xml @@ -1,89 +1,89 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - - Recent - + + + Recent + - - + + - - - - - - - + + + + + + + - - - - - - - File 1 + + + + + + + File 1 - - File 2 + + File 2 - - Older - + + Older + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_2.xml index ea731a465c..e4d9dd8922 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_2.xml @@ -1,114 +1,114 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - - Recent - + + + Recent + - - + + - - - - - - - + + + + + + + - - - - - - File 1 + + + + + + File 1 - - File 2 + + File 2 - - - Older - + + + Older + - - + + - - - - - - - + + + + + + + - - - - - - - Old 1 + + + + + + + Old 1 - - Old 2 + + Old 2 diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_1.xml index 0e07fadcc2..2c9c1383f0 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_1.xml @@ -1,52 +1,52 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - - Help + + + Help - - + + - - - - - - - + + + + + + + - - - - - - Help! + + + + + + Help! diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_2.xml index 7bac1ed80d..2fc1650210 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_2.xml @@ -1,55 +1,55 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - - Edit + + + Edit - - Help + + Help - - + + - - - - - + + + + + - - - - - - Copy + + + + + + Copy - - Paste + + Paste diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_3.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_3.xml index 9853fbd583..e047d30e0b 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_3.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_3.xml @@ -1,59 +1,59 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_1.xml index 7bac1ed80d..2fc1650210 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_1.xml @@ -1,55 +1,55 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - - Edit + + + Edit - - Help + + Help - - + + - - - - - + + + + + - - - - - - Copy + + + + + + Copy - - Paste + + Paste diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_2.xml index 0e07fadcc2..2c9c1383f0 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_2.xml @@ -1,52 +1,52 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - - Help + + + Help - - + + - - - - - - - + + + + + + + - - - - - - Help! + + + + + + Help! diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_3.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_3.xml index 9853fbd583..e047d30e0b 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_3.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_3.xml @@ -1,59 +1,59 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_1.xml index 6524ba580f..4907d78cb2 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_1.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - - New + + + + + + + New - - Open + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_2.xml index 7266be24a5..ff4346fdde 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_2.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - - Open + + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_3.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_3.xml index 42ede5dd40..642875f4d0 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_3.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_3.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open - - - Recent - + + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_1.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_1.xml index 7266be24a5..ff4346fdde 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_1.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_1.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - - Open + + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_2.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_2.xml index 6524ba580f..4907d78cb2 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_2.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_2.xml @@ -1,60 +1,60 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - Help + + Help - - + + - - - - - - - + + + + + + + - - - - - - - New + + + + + + + New - - Open + + Open - - Recent - + + Recent + diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_submenu_item.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_submenu_item.xml index 295171c03a..9c698e57da 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_submenu_item.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_submenu_item.xml @@ -1,32 +1,32 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - Help + + Help diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_enter.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_enter.xml index 295171c03a..9c698e57da 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_enter.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_enter.xml @@ -1,32 +1,32 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - Help + + Help diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_return.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_return.xml index 295171c03a..9c698e57da 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_return.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_return.xml @@ -1,32 +1,32 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - Help + + Help diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_space.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_space.xml index 295171c03a..9c698e57da 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_space.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_with_space.xml @@ -1,32 +1,32 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - Help + + Help diff --git a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_without_active_item.xml b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_without_active_item.xml index 295171c03a..9c698e57da 100644 --- a/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_without_active_item.xml +++ b/internal/driver/glfw/testdata/menu_bar_kbdctrl_trigger_without_active_item.xml @@ -1,32 +1,32 @@ - - Button + + Button - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit - - Help + + Help diff --git a/internal/driver/glfw/testdata/menu_bar_tap_content_with_active_menu_does_not_trigger_action_but_dismisses_menu.png b/internal/driver/glfw/testdata/menu_bar_tap_content_with_active_menu_does_not_trigger_action_but_dismisses_menu.png index 270e93b72f..3675a1aabc 100644 Binary files a/internal/driver/glfw/testdata/menu_bar_tap_content_with_active_menu_does_not_trigger_action_but_dismisses_menu.png and b/internal/driver/glfw/testdata/menu_bar_tap_content_with_active_menu_does_not_trigger_action_but_dismisses_menu.png differ diff --git a/internal/driver/glfw/testdata/menu_bar_toggle_deactivated.xml b/internal/driver/glfw/testdata/menu_bar_toggle_deactivated.xml index 214238d29c..1b45875f68 100644 --- a/internal/driver/glfw/testdata/menu_bar_toggle_deactivated.xml +++ b/internal/driver/glfw/testdata/menu_bar_toggle_deactivated.xml @@ -1,26 +1,26 @@ - - + + - - - - - + + + + + - - - - File + + + + File - - Edit + + Edit diff --git a/internal/driver/glfw/testdata/menu_bar_toggle_first_item_active.xml b/internal/driver/glfw/testdata/menu_bar_toggle_first_item_active.xml index 7882455d03..28173b3486 100644 --- a/internal/driver/glfw/testdata/menu_bar_toggle_first_item_active.xml +++ b/internal/driver/glfw/testdata/menu_bar_toggle_first_item_active.xml @@ -1,49 +1,49 @@ - - + + - - - - - + + + + + - - - - - File + + + + + File - - Edit + + Edit - - + + - - - - - - - + + + + + + + - - - - - - New + + + + + + New - - Open + + Open diff --git a/internal/driver/glfw/testdata/menu_bar_toggle_second_item_active.xml b/internal/driver/glfw/testdata/menu_bar_toggle_second_item_active.xml index 2de5bea88f..7ccdfc0e4b 100644 --- a/internal/driver/glfw/testdata/menu_bar_toggle_second_item_active.xml +++ b/internal/driver/glfw/testdata/menu_bar_toggle_second_item_active.xml @@ -1,49 +1,49 @@ - - + + - - - - - + + + + + - - - - File + + + + File - - - Edit + + + Edit - - + + - - - - - + + + + + - - - - - - Copy + + + + + + Copy - - Paste + + Paste diff --git a/internal/driver/glfw/testdata/windows_hover_object.xml b/internal/driver/glfw/testdata/windows_hover_object.xml index f976ba37bb..6642e58a88 100644 --- a/internal/driver/glfw/testdata/windows_hover_object.xml +++ b/internal/driver/glfw/testdata/windows_hover_object.xml @@ -3,34 +3,34 @@ - - - - - - - - + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - + + @@ -39,7 +39,7 @@ - + diff --git a/internal/driver/glfw/testdata/windows_no_hover_outside_object.xml b/internal/driver/glfw/testdata/windows_no_hover_outside_object.xml index 757bcb359c..1468f8c374 100644 --- a/internal/driver/glfw/testdata/windows_no_hover_outside_object.xml +++ b/internal/driver/glfw/testdata/windows_no_hover_outside_object.xml @@ -3,33 +3,33 @@ - - - - - - - - + + + + + + + + - - + + - - - - - - - - + + + + + + + + - - + + @@ -38,7 +38,7 @@ - + diff --git a/internal/driver/gomobile/driver.go b/internal/driver/gomobile/driver.go index 74f6e34386..f1aa31b926 100644 --- a/internal/driver/gomobile/driver.go +++ b/internal/driver/gomobile/driver.go @@ -98,8 +98,8 @@ func (d *mobileDriver) currentWindow() *window { return last } -func (d *mobileDriver) RenderedTextSize(text string, size float32, style fyne.TextStyle) fyne.Size { - return painter.RenderedTextSize(text, size, style) +func (d *mobileDriver) RenderedTextSize(text string, textSize float32, style fyne.TextStyle) (size fyne.Size, baseline float32) { + return painter.RenderedTextSize(text, textSize, style) } func (d *mobileDriver) CanvasForObject(obj fyne.CanvasObject) fyne.Canvas { @@ -147,7 +147,7 @@ func (d *mobileDriver) Run() { d.sendPaintEvent() case set := <-settingsChange: painter.ClearFontCache() - cache.ResetSvg() + cache.ResetThemeCaches() intapp.ApplySettingsWithCallback(set, fyne.CurrentApp(), func(w fyne.Window) { c, ok := w.Canvas().(*mobileCanvas) if !ok { diff --git a/internal/painter/font.go b/internal/painter/font.go index 97e2ff2a80..5f408f0003 100644 --- a/internal/painter/font.go +++ b/internal/painter/font.go @@ -4,12 +4,13 @@ import ( "image" "sync" + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/internal/cache" + "fyne.io/fyne/v2/theme" + "github.com/goki/freetype/truetype" "golang.org/x/image/font" "golang.org/x/image/math/fixed" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/theme" ) const ( @@ -29,16 +30,29 @@ func loadFont(data fyne.Resource) *truetype.Font { return loaded } -// RenderedTextSize looks up how bit a string would be if drawn on screen -func RenderedTextSize(text string, size float32, style fyne.TextStyle) fyne.Size { +// RenderedTextSize looks up how big a string would be if drawn on screen. +// It also returns the distance from top to the text baseline. +func RenderedTextSize(text string, fontSize float32, style fyne.TextStyle) (size fyne.Size, baseline float32) { + size, base := cache.GetFontMetrics(text, fontSize, style) + if base != 0 { + return size, base + } + + size, base = measureText(text, fontSize, style) + cache.SetFontMetrics(text, fontSize, style, size, base) + return size, base +} + +func measureText(text string, fontSize float32, style fyne.TextStyle) (fyne.Size, float32) { var opts truetype.Options - opts.Size = float64(size) + opts.Size = float64(fontSize) opts.DPI = TextDPI face := CachedFontFace(style, &opts) advance := MeasureString(face, text, style.TabWidth) - return fyne.NewSize(float32(advance.Ceil()), float32(face.Metrics().Height.Ceil())) + return fyne.NewSize(fixed266ToFloat32(advance), fixed266ToFloat32(face.Metrics().Height)), + fixed266ToFloat32(face.Metrics().Ascent) } type compositeFace struct { @@ -197,3 +211,7 @@ func ClearFontCache() { fontCache = make(map[fyne.TextStyle]*fontCacheItem) } + +func fixed266ToFloat32(i fixed.Int26_6) float32 { + return float32(float64(i) / (1 << 6)) +} diff --git a/internal/painter/software/testdata/draw_text_clipped.png b/internal/painter/software/testdata/draw_text_clipped.png index 75ecdd6e6b..e86d16f5ac 100644 Binary files a/internal/painter/software/testdata/draw_text_clipped.png and b/internal/painter/software/testdata/draw_text_clipped.png differ diff --git a/test/testapp.go b/test/testapp.go index 8e92a55d2b..aaabfc34fa 100644 --- a/test/testapp.go +++ b/test/testapp.go @@ -100,7 +100,7 @@ func NewApp() fyne.App { prefs := internal.NewInMemoryPreferences() test := &testApp{settings: settings, prefs: prefs, storage: &testStorage{}, driver: NewDriver().(*testDriver), lifecycle: &app.Lifecycle{}} - cache.ResetSvg() + cache.ResetThemeCaches() fyne.SetCurrentApp(test) listener := make(chan fyne.Settings) @@ -108,7 +108,7 @@ func NewApp() fyne.App { go func() { for { <-listener - cache.ResetSvg() + cache.ResetThemeCaches() app.ApplySettings(test.Settings(), test) test.propertyLock.Lock() diff --git a/test/testdriver.go b/test/testdriver.go index 60524afcfd..5a782cd10b 100644 --- a/test/testdriver.go +++ b/test/testdriver.go @@ -2,7 +2,6 @@ package test import ( "image" - "log" "sync" "fyne.io/fyne/v2" @@ -11,8 +10,6 @@ import ( "fyne.io/fyne/v2/internal/painter/software" intRepo "fyne.io/fyne/v2/internal/repository" "fyne.io/fyne/v2/storage/repository" - - "github.com/goki/freetype/truetype" ) // SoftwarePainter describes a simple type that can render canvases @@ -100,21 +97,8 @@ func (d *testDriver) Device() fyne.Device { } // RenderedTextSize looks up how bit a string would be if drawn on screen -func (d *testDriver) RenderedTextSize(text string, size float32, style fyne.TextStyle) fyne.Size { - var opts truetype.Options - opts.Size = float64(size) - opts.DPI = painter.TextDPI - - face := painter.CachedFontFace(style, &opts) - advance := painter.MeasureString(face, text, style.TabWidth) - - sws := fyne.NewSize(float32(advance.Ceil()), float32(face.Metrics().Height.Ceil())) - gls := painter.RenderedTextSize(text, size, style) - if sws != gls { - log.Println("SoftwareTextSize:", sws) - log.Println("GLTextSize:", gls) - } - return sws +func (d *testDriver) RenderedTextSize(text string, size float32, style fyne.TextStyle) (fyne.Size, float32) { + return painter.RenderedTextSize(text, size, style) } func (d *testDriver) Run() { diff --git a/text.go b/text.go index 0aa2fe4044..c5b0a721fe 100644 --- a/text.go +++ b/text.go @@ -43,5 +43,6 @@ type TextStyle struct { // MeasureText uses the current driver to calculate the size of text when rendered. func MeasureText(text string, size float32, style TextStyle) Size { - return CurrentApp().Driver().RenderedTextSize(text, size, style) + s, _ := CurrentApp().Driver().RenderedTextSize(text, size, style) + return s } diff --git a/widget/list_test.go b/widget/list_test.go index 97f939f64d..2996dc31ac 100644 --- a/widget/list_test.go +++ b/widget/list_test.go @@ -100,46 +100,46 @@ func TestList_Hover(t *testing.T) { func TestList_ScrollTo(t *testing.T) { list := createList(1000) - offset := float32(0) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + offset := 0 + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) list.ScrollTo(20) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) - offset = float32(6637) + offset = 6571 list.ScrollTo(200) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) - offset = float32(36999) + offset = 36670 list.ScrollTo(999) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) - offset = float32(19000) + offset = 18835 list.ScrollTo(500) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) list.ScrollTo(1000) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) - offset = float32(38) + offset = 37 list.ScrollTo(1) - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) } func TestList_ScrollToBottom(t *testing.T) { list := createList(1000) - offset := float32(36999) + offset := 36670 list.ScrollToBottom() - assert.Equal(t, offset, list.offsetY) - assert.Equal(t, offset, list.scroller.Offset.Y) + assert.Equal(t, offset, int(list.offsetY)) + assert.Equal(t, offset, int(list.scroller.Offset.Y)) } func TestList_ScrollToTop(t *testing.T) { @@ -187,19 +187,19 @@ func TestList_Select(t *testing.T) { assert.Equal(t, float32(0), list.offsetY) list.Select(50) - assert.Equal(t, float32(937), list.offsetY) + assert.Equal(t, 920, int(list.offsetY)) visible := list.scroller.Content.(*fyne.Container).Layout.(*listLayout).visible assert.Equal(t, visible[50].background.FillColor, theme.SelectionColor()) assert.True(t, visible[50].background.Visible()) list.Select(5) - assert.Equal(t, float32(190), list.offsetY) + assert.Equal(t, 188, int(list.offsetY)) visible = list.scroller.Content.(*fyne.Container).Layout.(*listLayout).visible assert.Equal(t, visible[5].background.FillColor, theme.SelectionColor()) assert.True(t, visible[5].background.Visible()) list.Select(6) - assert.Equal(t, float32(190), list.offsetY) + assert.Equal(t, 188, int(list.offsetY)) visible = list.scroller.Content.(*fyne.Container).Layout.(*listLayout).visible assert.False(t, visible[5].background.Visible()) assert.Equal(t, visible[6].background.FillColor, theme.SelectionColor()) diff --git a/widget/richtext.go b/widget/richtext.go index 8617856472..cc353ffee9 100644 --- a/widget/richtext.go +++ b/widget/richtext.go @@ -549,14 +549,57 @@ func (r *textRenderer) layoutRow(texts []fyne.CanvasObject, align fyne.TextAlign return texts[0].MinSize().Height } height := float32(0) - for _, text := range texts { - size := text.MinSize() - + tallestBaseline := float32(0) + realign := false + baselines := make([]float32, len(texts)) + for i, text := range texts { + var size fyne.Size + if txt, ok := text.(*canvas.Text); ok { + s, base := fyne.CurrentApp().Driver().RenderedTextSize(txt.Text, txt.TextSize, txt.TextStyle) + if base > tallestBaseline { + if tallestBaseline > 0 { + realign = true + } + tallestBaseline = base + } + size = s + baselines[i] = base + } else if c, ok := text.(*fyne.Container); ok { + wid := c.Objects[0] + if link, ok := wid.(*Hyperlink); ok { + s, base := fyne.CurrentApp().Driver().RenderedTextSize(link.Text, theme.TextSize(), link.TextStyle) + if base > tallestBaseline { + if tallestBaseline > 0 { + realign = true + } + tallestBaseline = base + } + size = s + baselines[i] = base + } + } + if size.IsZero() { + size = text.MinSize() + } text.Resize(size) - text.Move(fyne.NewPos(xPos, yPos)) // TODO also baseline align for height (need new measure info) + text.Move(fyne.NewPos(xPos, yPos)) + xPos += size.Width - height = fyne.Max(height, size.Height) + if height == 0 { + height = size.Height + } else if height != size.Height { + height = fyne.Max(height, size.Height) + realign = true + } } + + if realign { + for i, text := range texts { + delta := tallestBaseline - baselines[i] + text.Move(fyne.NewPos(text.Position().X, yPos+delta)) + } + } + spare := lineWidth - xPos switch align { case fyne.TextAlignTrailing: diff --git a/widget/testdata/accordion/layout_multiple_open_multiple_items.xml b/widget/testdata/accordion/layout_multiple_open_multiple_items.xml index e7bc8c5251..e4e410a193 100644 --- a/widget/testdata/accordion/layout_multiple_open_multiple_items.xml +++ b/widget/testdata/accordion/layout_multiple_open_multiple_items.xml @@ -1,21 +1,21 @@ - - - + + + - A - + A + - - + + - B - + B + - - + + diff --git a/widget/testdata/accordion/layout_multiple_open_multiple_items_opened.xml b/widget/testdata/accordion/layout_multiple_open_multiple_items_opened.xml index 095b5d358e..4fa3b215f8 100644 --- a/widget/testdata/accordion/layout_multiple_open_multiple_items_opened.xml +++ b/widget/testdata/accordion/layout_multiple_open_multiple_items_opened.xml @@ -1,27 +1,27 @@ - - - + + + - A - + A + - - + + - B - + B + - - 11111 + + 11111 - - 2222222222 + + 2222222222 - - + + diff --git a/widget/testdata/accordion/layout_multiple_open_one_item.xml b/widget/testdata/accordion/layout_multiple_open_one_item.xml index 833f848975..3385f2393f 100644 --- a/widget/testdata/accordion/layout_multiple_open_one_item.xml +++ b/widget/testdata/accordion/layout_multiple_open_one_item.xml @@ -1,12 +1,12 @@ - - - + + + - A - + A + diff --git a/widget/testdata/accordion/layout_multiple_open_one_item_opened.xml b/widget/testdata/accordion/layout_multiple_open_one_item_opened.xml index 21f0b3d2e3..0da8d246e2 100644 --- a/widget/testdata/accordion/layout_multiple_open_one_item_opened.xml +++ b/widget/testdata/accordion/layout_multiple_open_one_item_opened.xml @@ -1,15 +1,15 @@ - - - + + + - A - + A + - - 11111 + + 11111 diff --git a/widget/testdata/accordion/layout_single_open_multiple_items.xml b/widget/testdata/accordion/layout_single_open_multiple_items.xml index e7bc8c5251..e4e410a193 100644 --- a/widget/testdata/accordion/layout_single_open_multiple_items.xml +++ b/widget/testdata/accordion/layout_single_open_multiple_items.xml @@ -1,21 +1,21 @@ - - - + + + - A - + A + - - + + - B - + B + - - + + diff --git a/widget/testdata/accordion/layout_single_open_multiple_items_opened.xml b/widget/testdata/accordion/layout_single_open_multiple_items_opened.xml index e2840e5ffb..51d5c5583b 100644 --- a/widget/testdata/accordion/layout_single_open_multiple_items_opened.xml +++ b/widget/testdata/accordion/layout_single_open_multiple_items_opened.xml @@ -1,24 +1,24 @@ - - - + + + - A - + A + - - + + - B - + B + - - 2222222222 + + 2222222222 - - + + diff --git a/widget/testdata/accordion/layout_single_open_one_item.xml b/widget/testdata/accordion/layout_single_open_one_item.xml index 833f848975..3385f2393f 100644 --- a/widget/testdata/accordion/layout_single_open_one_item.xml +++ b/widget/testdata/accordion/layout_single_open_one_item.xml @@ -1,12 +1,12 @@ - - - + + + - A - + A + diff --git a/widget/testdata/accordion/layout_single_open_one_item_opened.xml b/widget/testdata/accordion/layout_single_open_one_item_opened.xml index 21f0b3d2e3..0da8d246e2 100644 --- a/widget/testdata/accordion/layout_single_open_one_item_opened.xml +++ b/widget/testdata/accordion/layout_single_open_one_item_opened.xml @@ -1,15 +1,15 @@ - - - + + + - A - + A + - - 11111 + + 11111 diff --git a/widget/testdata/accordion/theme_changed.png b/widget/testdata/accordion/theme_changed.png index f897ce0df7..4a5ac28d44 100644 Binary files a/widget/testdata/accordion/theme_changed.png and b/widget/testdata/accordion/theme_changed.png differ diff --git a/widget/testdata/accordion/theme_initial.png b/widget/testdata/accordion/theme_initial.png index 23bed221f5..11d95cecad 100644 Binary files a/widget/testdata/accordion/theme_initial.png and b/widget/testdata/accordion/theme_initial.png differ diff --git a/widget/testdata/button/layout_text_icon_center_leading.xml b/widget/testdata/button/layout_text_icon_center_leading.xml index c4d6483acf..56920504d4 100644 --- a/widget/testdata/button/layout_text_icon_center_leading.xml +++ b/widget/testdata/button/layout_text_icon_center_leading.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_icon_center_trailing.xml b/widget/testdata/button/layout_text_icon_center_trailing.xml index a2b3d257b0..84e9424729 100644 --- a/widget/testdata/button/layout_text_icon_center_trailing.xml +++ b/widget/testdata/button/layout_text_icon_center_trailing.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_icon_leading_leading.xml b/widget/testdata/button/layout_text_icon_leading_leading.xml index 19a84a26b1..1bc8547b49 100644 --- a/widget/testdata/button/layout_text_icon_leading_leading.xml +++ b/widget/testdata/button/layout_text_icon_leading_leading.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_icon_leading_trailing.xml b/widget/testdata/button/layout_text_icon_leading_trailing.xml index 850d7ea24c..e6017ad872 100644 --- a/widget/testdata/button/layout_text_icon_leading_trailing.xml +++ b/widget/testdata/button/layout_text_icon_leading_trailing.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_icon_trailing_leading.xml b/widget/testdata/button/layout_text_icon_trailing_leading.xml index 7c1769688e..be7acf67de 100644 --- a/widget/testdata/button/layout_text_icon_trailing_leading.xml +++ b/widget/testdata/button/layout_text_icon_trailing_leading.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_icon_trailing_trailing.xml b/widget/testdata/button/layout_text_icon_trailing_trailing.xml index a4db8bc915..d9be60bcf6 100644 --- a/widget/testdata/button/layout_text_icon_trailing_trailing.xml +++ b/widget/testdata/button/layout_text_icon_trailing_trailing.xml @@ -13,8 +13,8 @@ - Test - + Test + diff --git a/widget/testdata/button/layout_text_only_center_leading.xml b/widget/testdata/button/layout_text_only_center_leading.xml index 9e60fe3cc6..2577bd1ae4 100644 --- a/widget/testdata/button/layout_text_only_center_leading.xml +++ b/widget/testdata/button/layout_text_only_center_leading.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/button/layout_text_only_center_trailing.xml b/widget/testdata/button/layout_text_only_center_trailing.xml index 9e60fe3cc6..2577bd1ae4 100644 --- a/widget/testdata/button/layout_text_only_center_trailing.xml +++ b/widget/testdata/button/layout_text_only_center_trailing.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/button/layout_text_only_leading_leading.xml b/widget/testdata/button/layout_text_only_leading_leading.xml index 2fdcb6ce7c..89bc1d7fec 100644 --- a/widget/testdata/button/layout_text_only_leading_leading.xml +++ b/widget/testdata/button/layout_text_only_leading_leading.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/button/layout_text_only_leading_trailing.xml b/widget/testdata/button/layout_text_only_leading_trailing.xml index 2fdcb6ce7c..89bc1d7fec 100644 --- a/widget/testdata/button/layout_text_only_leading_trailing.xml +++ b/widget/testdata/button/layout_text_only_leading_trailing.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/button/layout_text_only_trailing_leading.xml b/widget/testdata/button/layout_text_only_trailing_leading.xml index 673cc24ab4..9c74be654b 100644 --- a/widget/testdata/button/layout_text_only_trailing_leading.xml +++ b/widget/testdata/button/layout_text_only_trailing_leading.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/button/layout_text_only_trailing_trailing.xml b/widget/testdata/button/layout_text_only_trailing_trailing.xml index 673cc24ab4..9c74be654b 100644 --- a/widget/testdata/button/layout_text_only_trailing_trailing.xml +++ b/widget/testdata/button/layout_text_only_trailing_trailing.xml @@ -13,7 +13,7 @@ - Test + Test diff --git a/widget/testdata/card/layout_all_items.xml b/widget/testdata/card/layout_all_items.xml index b8660785a2..44a117beea 100644 --- a/widget/testdata/card/layout_all_items.xml +++ b/widget/testdata/card/layout_all_items.xml @@ -1,20 +1,20 @@ - + - - + + - - - - - - - + + + + + + + - Longer title - subtitle with length - - + Longer title + subtitle with length + + diff --git a/widget/testdata/card/layout_subtitle.xml b/widget/testdata/card/layout_subtitle.xml index e8a7056179..bf88097c14 100644 --- a/widget/testdata/card/layout_subtitle.xml +++ b/widget/testdata/card/layout_subtitle.xml @@ -1,18 +1,18 @@ - + - - + + - - - - - + + + + + - Subtitle + Subtitle diff --git a/widget/testdata/card/layout_title.xml b/widget/testdata/card/layout_title.xml index 71d0141cb2..aae8d5a754 100644 --- a/widget/testdata/card/layout_title.xml +++ b/widget/testdata/card/layout_title.xml @@ -1,17 +1,17 @@ - + - - + + - - - - - + + + + + - Title + Title diff --git a/widget/testdata/card/layout_title_content.xml b/widget/testdata/card/layout_title_content.xml index e64795fc29..7ee0b53fbc 100644 --- a/widget/testdata/card/layout_title_content.xml +++ b/widget/testdata/card/layout_title_content.xml @@ -1,19 +1,19 @@ - + - - + + - - - - - - - + + + + + + + - Hello + Hello - + diff --git a/widget/testdata/card/layout_titles.xml b/widget/testdata/card/layout_titles.xml index abcfa9affc..29726ac63c 100644 --- a/widget/testdata/card/layout_titles.xml +++ b/widget/testdata/card/layout_titles.xml @@ -1,18 +1,18 @@ - + - - + + - - - - - + + + + + - Title - Subtitle + Title + Subtitle diff --git a/widget/testdata/card/layout_titles_image.xml b/widget/testdata/card/layout_titles_image.xml index 36742f2eb3..e83f5669b1 100644 --- a/widget/testdata/card/layout_titles_image.xml +++ b/widget/testdata/card/layout_titles_image.xml @@ -1,18 +1,18 @@ - + - - + + - - - - - + + + + + - Title - Subtitle + Title + Subtitle diff --git a/widget/testdata/check/layout_checked.xml b/widget/testdata/check/layout_checked.xml index 34dc255c9c..a8a5e39d3b 100644 --- a/widget/testdata/check/layout_checked.xml +++ b/widget/testdata/check/layout_checked.xml @@ -1,10 +1,10 @@ - + - Test + Test diff --git a/widget/testdata/check/layout_checked_disabled.xml b/widget/testdata/check/layout_checked_disabled.xml index 9ec6dbc4d6..b34a0d1db1 100644 --- a/widget/testdata/check/layout_checked_disabled.xml +++ b/widget/testdata/check/layout_checked_disabled.xml @@ -1,10 +1,10 @@ - + - Test + Test diff --git a/widget/testdata/check/layout_unchecked.xml b/widget/testdata/check/layout_unchecked.xml index f686f5915f..915cecdb3c 100644 --- a/widget/testdata/check/layout_unchecked.xml +++ b/widget/testdata/check/layout_unchecked.xml @@ -1,10 +1,10 @@ - + - Test + Test diff --git a/widget/testdata/check/layout_unchecked_disabled.xml b/widget/testdata/check/layout_unchecked_disabled.xml index ad86ab07b2..99be538f9f 100644 --- a/widget/testdata/check/layout_unchecked_disabled.xml +++ b/widget/testdata/check/layout_unchecked_disabled.xml @@ -1,10 +1,10 @@ - + - Test + Test diff --git a/widget/testdata/entry/disableable_disabled_custom_value.xml b/widget/testdata/entry/disableable_disabled_custom_value.xml index c1413fb825..a2200d04cf 100644 --- a/widget/testdata/entry/disableable_disabled_custom_value.xml +++ b/widget/testdata/entry/disableable_disabled_custom_value.xml @@ -1,11 +1,11 @@ - - - - - - Hello + + + + + + Hello diff --git a/widget/testdata/entry/disableable_disabled_empty.xml b/widget/testdata/entry/disableable_disabled_empty.xml index d36cf97373..de36f819b6 100644 --- a/widget/testdata/entry/disableable_disabled_empty.xml +++ b/widget/testdata/entry/disableable_disabled_empty.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/disableable_disabled_placeholder.xml b/widget/testdata/entry/disableable_disabled_placeholder.xml index adb0a55f12..1802d72b09 100644 --- a/widget/testdata/entry/disableable_disabled_placeholder.xml +++ b/widget/testdata/entry/disableable_disabled_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - Type! + + + + + + Type! - - + + diff --git a/widget/testdata/entry/disableable_enabled_custom_value.xml b/widget/testdata/entry/disableable_enabled_custom_value.xml index 3ffe1060e2..b5b2316304 100644 --- a/widget/testdata/entry/disableable_enabled_custom_value.xml +++ b/widget/testdata/entry/disableable_enabled_custom_value.xml @@ -1,11 +1,11 @@ - - - - - - Hello + + + + + + Hello diff --git a/widget/testdata/entry/disableable_enabled_empty.xml b/widget/testdata/entry/disableable_enabled_empty.xml index ebf7d8bf1d..8c43133403 100644 --- a/widget/testdata/entry/disableable_enabled_empty.xml +++ b/widget/testdata/entry/disableable_enabled_empty.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/disableable_enabled_placeholder.xml b/widget/testdata/entry/disableable_enabled_placeholder.xml index e8e514789e..3777827212 100644 --- a/widget/testdata/entry/disableable_enabled_placeholder.xml +++ b/widget/testdata/entry/disableable_enabled_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - Type! + + + + + + Type! - - + + diff --git a/widget/testdata/entry/disabled_text_selected.png b/widget/testdata/entry/disabled_text_selected.png index 9b07619a9d..f4af8ebdce 100644 Binary files a/widget/testdata/entry/disabled_text_selected.png and b/widget/testdata/entry/disabled_text_selected.png differ diff --git a/widget/testdata/entry/focus_gained.xml b/widget/testdata/entry/focus_gained.xml index a7f59d908d..2dabbb4212 100644 --- a/widget/testdata/entry/focus_gained.xml +++ b/widget/testdata/entry/focus_gained.xml @@ -1,16 +1,16 @@ - - - - - - + + + + + + - - + + - + diff --git a/widget/testdata/entry/focus_lost.xml b/widget/testdata/entry/focus_lost.xml index ebf7d8bf1d..8c43133403 100644 --- a/widget/testdata/entry/focus_lost.xml +++ b/widget/testdata/entry/focus_lost.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/focus_with_popup_dismissed.xml b/widget/testdata/entry/focus_with_popup_dismissed.xml index a7f59d908d..2dabbb4212 100644 --- a/widget/testdata/entry/focus_with_popup_dismissed.xml +++ b/widget/testdata/entry/focus_with_popup_dismissed.xml @@ -1,16 +1,16 @@ - - - - - - + + + + + + - - + + - + diff --git a/widget/testdata/entry/focus_with_popup_entry_selected.xml b/widget/testdata/entry/focus_with_popup_entry_selected.xml index a7f59d908d..2dabbb4212 100644 --- a/widget/testdata/entry/focus_with_popup_entry_selected.xml +++ b/widget/testdata/entry/focus_with_popup_entry_selected.xml @@ -1,16 +1,16 @@ - - - - - - + + + + + + - - + + - + diff --git a/widget/testdata/entry/focus_with_popup_initial.xml b/widget/testdata/entry/focus_with_popup_initial.xml index 72ef150fae..4d4aa164ba 100644 --- a/widget/testdata/entry/focus_with_popup_initial.xml +++ b/widget/testdata/entry/focus_with_popup_initial.xml @@ -1,47 +1,47 @@ - - - - - - + + + + + + - - + + - + - - + + - - - - - - - + + + + + + + - - - - - - Cut + + + + + + Cut - - Copy + + Copy - - Paste + + Paste - - Select all + + Select all diff --git a/widget/testdata/entry/focused_disabled.xml b/widget/testdata/entry/focused_disabled.xml index d36cf97373..de36f819b6 100644 --- a/widget/testdata/entry/focused_disabled.xml +++ b/widget/testdata/entry/focused_disabled.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/focused_enabled.xml b/widget/testdata/entry/focused_enabled.xml index a7f59d908d..2dabbb4212 100644 --- a/widget/testdata/entry/focused_enabled.xml +++ b/widget/testdata/entry/focused_enabled.xml @@ -1,16 +1,16 @@ - - - - - - + + + + + + - - + + - + diff --git a/widget/testdata/entry/initial.xml b/widget/testdata/entry/initial.xml index ebf7d8bf1d..8c43133403 100644 --- a/widget/testdata/entry/initial.xml +++ b/widget/testdata/entry/initial.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/initial_multiline.xml b/widget/testdata/entry/initial_multiline.xml index affcb0c6ac..879a3f590b 100644 --- a/widget/testdata/entry/initial_multiline.xml +++ b/widget/testdata/entry/initial_multiline.xml @@ -6,10 +6,10 @@ - + - + diff --git a/widget/testdata/entry/on_key_down_newline_initial.xml b/widget/testdata/entry/on_key_down_newline_initial.xml index ec831eca80..6726520acf 100644 --- a/widget/testdata/entry/on_key_down_newline_initial.xml +++ b/widget/testdata/entry/on_key_down_newline_initial.xml @@ -6,7 +6,7 @@ - Hi + Hi diff --git a/widget/testdata/entry/on_key_down_newline_typed.xml b/widget/testdata/entry/on_key_down_newline_typed.xml index 32d30cbe9a..eea4740bd4 100644 --- a/widget/testdata/entry/on_key_down_newline_typed.xml +++ b/widget/testdata/entry/on_key_down_newline_typed.xml @@ -6,10 +6,10 @@ - H - oi + H + oi - + diff --git a/widget/testdata/entry/placeholder_with_text.xml b/widget/testdata/entry/placeholder_with_text.xml index 19d12053db..cc8394e773 100644 --- a/widget/testdata/entry/placeholder_with_text.xml +++ b/widget/testdata/entry/placeholder_with_text.xml @@ -1,11 +1,11 @@ - + - - - - - - Text + + + + + + Text diff --git a/widget/testdata/entry/placeholder_without_text.xml b/widget/testdata/entry/placeholder_without_text.xml index cb06c53fd8..53b3791f94 100644 --- a/widget/testdata/entry/placeholder_without_text.xml +++ b/widget/testdata/entry/placeholder_without_text.xml @@ -1,14 +1,14 @@ - + - - - - - - Placehold + + + + + + Placehold - - + + diff --git a/widget/testdata/entry/select_add_selection.xml b/widget/testdata/entry/select_add_selection.xml index d3649dffb9..bbc2289a0d 100644 --- a/widget/testdata/entry/select_add_selection.xml +++ b/widget/testdata/entry/select_add_selection.xml @@ -1,14 +1,14 @@ - - - - - - - Testing + + + + + + + Testing - + diff --git a/widget/testdata/entry/select_all_initial.xml b/widget/testdata/entry/select_all_initial.xml index 7076d82a8d..cb5f19a6f2 100644 --- a/widget/testdata/entry/select_all_initial.xml +++ b/widget/testdata/entry/select_all_initial.xml @@ -6,11 +6,11 @@ - First Row - Second Row - Third Row + First Row + Second Row + Third Row - + diff --git a/widget/testdata/entry/select_all_selected.xml b/widget/testdata/entry/select_all_selected.xml index ca8aabeb5f..ac2fbb16be 100644 --- a/widget/testdata/entry/select_all_selected.xml +++ b/widget/testdata/entry/select_all_selected.xml @@ -5,15 +5,15 @@ - - - + + + - First Row - Second Row - Third Row + First Row + Second Row + Third Row - + diff --git a/widget/testdata/entry/select_initial.xml b/widget/testdata/entry/select_initial.xml index 0e6e2f5d65..d6075c90c1 100644 --- a/widget/testdata/entry/select_initial.xml +++ b/widget/testdata/entry/select_initial.xml @@ -1,13 +1,13 @@ - - - - - - Testing + + + + + + Testing - + diff --git a/widget/testdata/entry/select_move_wo_shift.xml b/widget/testdata/entry/select_move_wo_shift.xml index aebc187f2a..3e1c3b569d 100644 --- a/widget/testdata/entry/select_move_wo_shift.xml +++ b/widget/testdata/entry/select_move_wo_shift.xml @@ -1,13 +1,13 @@ - - - - - - Testing + + + + + + Testing - + diff --git a/widget/testdata/entry/select_multi_line_initial.xml b/widget/testdata/entry/select_multi_line_initial.xml index 1f0701f59f..f0fe836d6f 100644 --- a/widget/testdata/entry/select_multi_line_initial.xml +++ b/widget/testdata/entry/select_multi_line_initial.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/select_multi_line_pagedown.xml b/widget/testdata/entry/select_multi_line_pagedown.xml index 6d90f6c69c..1b3d007229 100644 --- a/widget/testdata/entry/select_multi_line_pagedown.xml +++ b/widget/testdata/entry/select_multi_line_pagedown.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + 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 f92497b87f..5f9e8abbf2 100644 --- a/widget/testdata/entry/select_multi_line_shift_pagedown.xml +++ b/widget/testdata/entry/select_multi_line_shift_pagedown.xml @@ -5,15 +5,15 @@ - - - + + + - Testing - Testing - Testing + Testing + 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 4bd4cf18a7..24c19930f4 100644 --- a/widget/testdata/entry/select_multi_line_shift_pageup.xml +++ b/widget/testdata/entry/select_multi_line_shift_pageup.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/select_select_left.xml b/widget/testdata/entry/select_select_left.xml index 4319782190..8ab2fb7c27 100644 --- a/widget/testdata/entry/select_select_left.xml +++ b/widget/testdata/entry/select_select_left.xml @@ -1,14 +1,14 @@ - - - - - - - Testing + + + + + + + Testing - + diff --git a/widget/testdata/entry/select_selected.xml b/widget/testdata/entry/select_selected.xml index ade09e2f9a..4072037b39 100644 --- a/widget/testdata/entry/select_selected.xml +++ b/widget/testdata/entry/select_selected.xml @@ -1,14 +1,14 @@ - - - - - - - Testing + + + + + + + Testing - + diff --git a/widget/testdata/entry/select_single_line_pagedown.xml b/widget/testdata/entry/select_single_line_pagedown.xml index f5c43b4568..8a2089db9e 100644 --- a/widget/testdata/entry/select_single_line_pagedown.xml +++ b/widget/testdata/entry/select_single_line_pagedown.xml @@ -1,13 +1,13 @@ - - - - - - Testing + + + + + + Testing - + diff --git a/widget/testdata/entry/select_single_line_shift_pagedown.xml b/widget/testdata/entry/select_single_line_shift_pagedown.xml index f39130b316..a66b94e0d0 100644 --- a/widget/testdata/entry/select_single_line_shift_pagedown.xml +++ b/widget/testdata/entry/select_single_line_shift_pagedown.xml @@ -1,14 +1,14 @@ - - - - - - - Testing + + + + + + + Testing - + diff --git a/widget/testdata/entry/select_single_line_shift_pageup.xml b/widget/testdata/entry/select_single_line_shift_pageup.xml index 807c1cd9c8..75e3f9c67e 100644 --- a/widget/testdata/entry/select_single_line_shift_pageup.xml +++ b/widget/testdata/entry/select_single_line_shift_pageup.xml @@ -1,14 +1,14 @@ - - - - - - - Testing + + + + + + + Testing - + diff --git a/widget/testdata/entry/selection_add_one_row_down.xml b/widget/testdata/entry/selection_add_one_row_down.xml index 54b5772d0a..f9e4277b60 100644 --- a/widget/testdata/entry/selection_add_one_row_down.xml +++ b/widget/testdata/entry/selection_add_one_row_down.xml @@ -5,14 +5,14 @@ - - + + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_add_to_end.xml b/widget/testdata/entry/selection_add_to_end.xml index d7e5a179f0..ce64f758f6 100644 --- a/widget/testdata/entry/selection_add_to_end.xml +++ b/widget/testdata/entry/selection_add_to_end.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_add_to_home.xml b/widget/testdata/entry/selection_add_to_home.xml index c4f9b6cc1c..d2087670b1 100644 --- a/widget/testdata/entry/selection_add_to_home.xml +++ b/widget/testdata/entry/selection_add_to_home.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + 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 d383fc3147..04c9dcacb0 100644 --- a/widget/testdata/entry/selection_delete_and_add_down.xml +++ b/widget/testdata/entry/selection_delete_and_add_down.xml @@ -5,14 +5,14 @@ - - + + - Testing - Teng - Testing + Testing + 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 5fad7da5bb..cdb2dd837a 100644 --- a/widget/testdata/entry/selection_delete_and_add_up.xml +++ b/widget/testdata/entry/selection_delete_and_add_up.xml @@ -5,14 +5,14 @@ - - + + - Testing - Teng - Testing + Testing + Teng + Testing - + diff --git a/widget/testdata/entry/selection_delete_multi_line.xml b/widget/testdata/entry/selection_delete_multi_line.xml index 1d7504cad8..232fb969a9 100644 --- a/widget/testdata/entry/selection_delete_multi_line.xml +++ b/widget/testdata/entry/selection_delete_multi_line.xml @@ -6,10 +6,10 @@ - Testing - Teng + 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 c6df87ece7..3a8bb53588 100644 --- a/widget/testdata/entry/selection_delete_reverse_multi_line.xml +++ b/widget/testdata/entry/selection_delete_reverse_multi_line.xml @@ -6,10 +6,10 @@ - Testing - Testisting + Testing + Testisting - + diff --git a/widget/testdata/entry/selection_delete_single_line.xml b/widget/testdata/entry/selection_delete_single_line.xml index 093441a55e..4b8944e84f 100644 --- a/widget/testdata/entry/selection_delete_single_line.xml +++ b/widget/testdata/entry/selection_delete_single_line.xml @@ -6,11 +6,11 @@ - Testing - Teng - Testing + Testing + Teng + Testing - + diff --git a/widget/testdata/entry/selection_deselect_backspace.xml b/widget/testdata/entry/selection_deselect_backspace.xml index f647402482..237dfd3c97 100644 --- a/widget/testdata/entry/selection_deselect_backspace.xml +++ b/widget/testdata/entry/selection_deselect_backspace.xml @@ -6,11 +6,11 @@ - Testing - Tsting - Testing + Testing + Tsting + Testing - + diff --git a/widget/testdata/entry/selection_deselect_delete.xml b/widget/testdata/entry/selection_deselect_delete.xml index c70cb881c3..3c9cb6c26b 100644 --- a/widget/testdata/entry/selection_deselect_delete.xml +++ b/widget/testdata/entry/selection_deselect_delete.xml @@ -6,11 +6,11 @@ - Testing - Teting - Testing + Testing + Teting + Testing - + diff --git a/widget/testdata/entry/selection_deselect_select_backspace.xml b/widget/testdata/entry/selection_deselect_select_backspace.xml index 186f14b376..c11ab07735 100644 --- a/widget/testdata/entry/selection_deselect_select_backspace.xml +++ b/widget/testdata/entry/selection_deselect_select_backspace.xml @@ -6,11 +6,11 @@ - Testing - Teing - Testing + Testing + Teing + Testing - + diff --git a/widget/testdata/entry/selection_end.xml b/widget/testdata/entry/selection_end.xml index 3eba338472..b1c1fc136a 100644 --- a/widget/testdata/entry/selection_end.xml +++ b/widget/testdata/entry/selection_end.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_enter.xml b/widget/testdata/entry/selection_enter.xml index 69954480ab..92dc1330ac 100644 --- a/widget/testdata/entry/selection_enter.xml +++ b/widget/testdata/entry/selection_enter.xml @@ -6,12 +6,12 @@ - Testing - Te - ng - Testing + Testing + Te + ng + Testing - + diff --git a/widget/testdata/entry/selection_focus_gained.xml b/widget/testdata/entry/selection_focus_gained.xml index bf3ef8d042..5d3de83c69 100644 --- a/widget/testdata/entry/selection_focus_gained.xml +++ b/widget/testdata/entry/selection_focus_gained.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_focus_lost.xml b/widget/testdata/entry/selection_focus_lost.xml index 3b5bdd5baa..24621ee93b 100644 --- a/widget/testdata/entry/selection_focus_lost.xml +++ b/widget/testdata/entry/selection_focus_lost.xml @@ -6,9 +6,9 @@ - Testing - Testing - Testing + Testing + Testing + Testing diff --git a/widget/testdata/entry/selection_home.xml b/widget/testdata/entry/selection_home.xml index 1cacef87c7..d180bb6e0e 100644 --- a/widget/testdata/entry/selection_home.xml +++ b/widget/testdata/entry/selection_home.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_initial.xml b/widget/testdata/entry/selection_initial.xml index bf3ef8d042..5d3de83c69 100644 --- a/widget/testdata/entry/selection_initial.xml +++ b/widget/testdata/entry/selection_initial.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_initial_reverse.xml b/widget/testdata/entry/selection_initial_reverse.xml index 1aaa7e4750..bafc96fdb2 100644 --- a/widget/testdata/entry/selection_initial_reverse.xml +++ b/widget/testdata/entry/selection_initial_reverse.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + 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 ae36acb5fb..ce95fcba96 100644 --- a/widget/testdata/entry/selection_remove_add_one_row_up.xml +++ b/widget/testdata/entry/selection_remove_add_one_row_up.xml @@ -5,14 +5,14 @@ - - + + - Testing - Testing - Testing + Testing + 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 bf3ef8d042..5d3de83c69 100644 --- a/widget/testdata/entry/selection_remove_one_row_up.xml +++ b/widget/testdata/entry/selection_remove_one_row_up.xml @@ -5,13 +5,13 @@ - + - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_replace.xml b/widget/testdata/entry/selection_replace.xml index 7dc6b43afd..a056f55c96 100644 --- a/widget/testdata/entry/selection_replace.xml +++ b/widget/testdata/entry/selection_replace.xml @@ -6,11 +6,11 @@ - Testing - Tehellong - Testing + Testing + Tehellong + Testing - + diff --git a/widget/testdata/entry/selection_snap_down.xml b/widget/testdata/entry/selection_snap_down.xml index 722b8c8b8a..a9ef8e211e 100644 --- a/widget/testdata/entry/selection_snap_down.xml +++ b/widget/testdata/entry/selection_snap_down.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_snap_left.xml b/widget/testdata/entry/selection_snap_left.xml index ed71c84592..a99a73cca8 100644 --- a/widget/testdata/entry/selection_snap_left.xml +++ b/widget/testdata/entry/selection_snap_left.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_snap_right.xml b/widget/testdata/entry/selection_snap_right.xml index 75b03865ac..2ba845b4e2 100644 --- a/widget/testdata/entry/selection_snap_right.xml +++ b/widget/testdata/entry/selection_snap_right.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/selection_snap_up.xml b/widget/testdata/entry/selection_snap_up.xml index 03501e2c7a..f4499e1cf9 100644 --- a/widget/testdata/entry/selection_snap_up.xml +++ b/widget/testdata/entry/selection_snap_up.xml @@ -6,11 +6,11 @@ - Testing - Testing - Testing + Testing + Testing + Testing - + diff --git a/widget/testdata/entry/set_placeholder_replaced.xml b/widget/testdata/entry/set_placeholder_replaced.xml index 546e833020..3981ea751c 100644 --- a/widget/testdata/entry/set_placeholder_replaced.xml +++ b/widget/testdata/entry/set_placeholder_replaced.xml @@ -1,11 +1,11 @@ - - - - - - Hi + + + + + + Hi diff --git a/widget/testdata/entry/set_placeholder_set.xml b/widget/testdata/entry/set_placeholder_set.xml index f34739ed70..2bf04918ed 100644 --- a/widget/testdata/entry/set_placeholder_set.xml +++ b/widget/testdata/entry/set_placeholder_set.xml @@ -1,14 +1,14 @@ - - - - - - Test + + + + + + Test - - + + diff --git a/widget/testdata/entry/set_text_changed.xml b/widget/testdata/entry/set_text_changed.xml index 9be73bf3f6..d836e2f716 100644 --- a/widget/testdata/entry/set_text_changed.xml +++ b/widget/testdata/entry/set_text_changed.xml @@ -1,11 +1,11 @@ - - - - - - Test + + + + + + Test diff --git a/widget/testdata/entry/set_text_style_bold.xml b/widget/testdata/entry/set_text_style_bold.xml index 2bc9160cad..f6a28b0269 100644 --- a/widget/testdata/entry/set_text_style_bold.xml +++ b/widget/testdata/entry/set_text_style_bold.xml @@ -1,11 +1,11 @@ - - - - - - Styled Text + + + + + + Styled Text diff --git a/widget/testdata/entry/set_text_style_italic.xml b/widget/testdata/entry/set_text_style_italic.xml index e3871db6ac..6f36e7efc6 100644 --- a/widget/testdata/entry/set_text_style_italic.xml +++ b/widget/testdata/entry/set_text_style_italic.xml @@ -1,11 +1,11 @@ - - - - - - Styled Text + + + + + + Styled Text diff --git a/widget/testdata/entry/set_text_style_monospace.xml b/widget/testdata/entry/set_text_style_monospace.xml index 23583dd3c4..d7623beb18 100644 --- a/widget/testdata/entry/set_text_style_monospace.xml +++ b/widget/testdata/entry/set_text_style_monospace.xml @@ -1,11 +1,11 @@ - - - - - - Styled Text + + + + + + Styled Text diff --git a/widget/testdata/entry/tab-content.png b/widget/testdata/entry/tab-content.png index 6d9136127d..32b8fb5428 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 8b0d623c2b..a2bc1029cd 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 23adbb8ed0..95a981adc5 100644 --- a/widget/testdata/entry/tapped_focused.xml +++ b/widget/testdata/entry/tapped_focused.xml @@ -6,11 +6,11 @@ - MMM - WWW - + MMM + WWW + - + diff --git a/widget/testdata/entry/tapped_initial.xml b/widget/testdata/entry/tapped_initial.xml index 3b437f4bd1..66d597da1b 100644 --- a/widget/testdata/entry/tapped_initial.xml +++ b/widget/testdata/entry/tapped_initial.xml @@ -6,9 +6,9 @@ - MMM - WWW - + MMM + WWW + diff --git a/widget/testdata/entry/tapped_secondary_full_menu.xml b/widget/testdata/entry/tapped_secondary_full_menu.xml index 064e381fa2..2ec551fbe0 100644 --- a/widget/testdata/entry/tapped_secondary_full_menu.xml +++ b/widget/testdata/entry/tapped_secondary_full_menu.xml @@ -1,47 +1,47 @@ - - - - - - + + + + + + - - + + - + - - + + - - - - - - - + + + + + + + - - - - - - Cut + + + + + + Cut - - Copy + + Copy - - Paste + + Paste - - Select all + + Select all diff --git a/widget/testdata/entry/tapped_secondary_no_password_menu.xml b/widget/testdata/entry/tapped_secondary_no_password_menu.xml index d36cf97373..de36f819b6 100644 --- a/widget/testdata/entry/tapped_secondary_no_password_menu.xml +++ b/widget/testdata/entry/tapped_secondary_no_password_menu.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/tapped_secondary_password_menu.xml b/widget/testdata/entry/tapped_secondary_password_menu.xml index d2486a1f02..c87ac6ab42 100644 --- a/widget/testdata/entry/tapped_secondary_password_menu.xml +++ b/widget/testdata/entry/tapped_secondary_password_menu.xml @@ -1,41 +1,41 @@ - - - - - - + + + + + + - - + + - + - - + + - - - - - - - + + + + + + + - - - - - - Paste + + + + + + Paste - - Select all + + Select all diff --git a/widget/testdata/entry/tapped_secondary_read_menu.xml b/widget/testdata/entry/tapped_secondary_read_menu.xml index 7d83289035..47530dadee 100644 --- a/widget/testdata/entry/tapped_secondary_read_menu.xml +++ b/widget/testdata/entry/tapped_secondary_read_menu.xml @@ -1,40 +1,40 @@ - - - - - - + + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - - - - Copy + + + + + + Copy - - Select all + + Select all diff --git a/widget/testdata/entry/tapped_tapped_2nd_m.xml b/widget/testdata/entry/tapped_tapped_2nd_m.xml index 0958a85595..54bce66a72 100644 --- a/widget/testdata/entry/tapped_tapped_2nd_m.xml +++ b/widget/testdata/entry/tapped_tapped_2nd_m.xml @@ -6,11 +6,11 @@ - MMM - WWW - + MMM + WWW + - + diff --git a/widget/testdata/entry/tapped_tapped_3rd_m.xml b/widget/testdata/entry/tapped_tapped_3rd_m.xml index 5f8b0519fc..f91cd3e4c5 100644 --- a/widget/testdata/entry/tapped_tapped_3rd_m.xml +++ b/widget/testdata/entry/tapped_tapped_3rd_m.xml @@ -6,11 +6,11 @@ - MMM - WWW - + MMM + WWW + - + diff --git a/widget/testdata/entry/tapped_tapped_after_last_col.xml b/widget/testdata/entry/tapped_tapped_after_last_col.xml index 7ae0f2dc53..770d72ee36 100644 --- a/widget/testdata/entry/tapped_tapped_after_last_col.xml +++ b/widget/testdata/entry/tapped_tapped_after_last_col.xml @@ -6,11 +6,11 @@ - MMM - WWW - + MMM + WWW + - + diff --git a/widget/testdata/entry/tapped_tapped_after_last_row.xml b/widget/testdata/entry/tapped_tapped_after_last_row.xml index 3971112cf0..f668ca6192 100644 --- a/widget/testdata/entry/tapped_tapped_after_last_row.xml +++ b/widget/testdata/entry/tapped_tapped_after_last_row.xml @@ -6,11 +6,11 @@ - MMM - WWW - + MMM + WWW + - + diff --git a/widget/testdata/entry/validate_initial.xml b/widget/testdata/entry/validate_initial.xml index ebf7d8bf1d..8c43133403 100644 --- a/widget/testdata/entry/validate_initial.xml +++ b/widget/testdata/entry/validate_initial.xml @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - + + diff --git a/widget/testdata/entry/validate_invalid.xml b/widget/testdata/entry/validate_invalid.xml index 0336d572e7..79a38438f1 100644 --- a/widget/testdata/entry/validate_invalid.xml +++ b/widget/testdata/entry/validate_invalid.xml @@ -1,11 +1,11 @@ - - - - - - 2020-02 + + + + + + 2020-02 diff --git a/widget/testdata/entry/validate_valid.xml b/widget/testdata/entry/validate_valid.xml index 946a96f155..76f4c011b2 100644 --- a/widget/testdata/entry/validate_valid.xml +++ b/widget/testdata/entry/validate_valid.xml @@ -1,13 +1,13 @@ - - - - - - 2020-02-12 + + + + + + 2020-02-12 - + diff --git a/widget/testdata/entry/validator_not_empty_focused.xml b/widget/testdata/entry/validator_not_empty_focused.xml index f68598f24a..697ca4373f 100644 --- a/widget/testdata/entry/validator_not_empty_focused.xml +++ b/widget/testdata/entry/validator_not_empty_focused.xml @@ -1,20 +1,20 @@ - + - - - - - - - + + + + + + + - - + + - + - + diff --git a/widget/testdata/entry/validator_not_empty_initial.xml b/widget/testdata/entry/validator_not_empty_initial.xml index 2b7ed33c56..2adfe7e15f 100644 --- a/widget/testdata/entry/validator_not_empty_initial.xml +++ b/widget/testdata/entry/validator_not_empty_initial.xml @@ -1,19 +1,19 @@ - + - - - - - - - + + + + + + + - - + + - + diff --git a/widget/testdata/entry/validator_not_empty_unfocused.xml b/widget/testdata/entry/validator_not_empty_unfocused.xml index c69941156b..c07b29e59a 100644 --- a/widget/testdata/entry/validator_not_empty_unfocused.xml +++ b/widget/testdata/entry/validator_not_empty_unfocused.xml @@ -1,19 +1,19 @@ - + - - - - - - - + + + + + + + - - + + - + diff --git a/widget/testdata/entry/wrap_multi_line_off.xml b/widget/testdata/entry/wrap_multi_line_off.xml index 839b659b0f..2082f013e4 100644 --- a/widget/testdata/entry/wrap_multi_line_off.xml +++ b/widget/testdata/entry/wrap_multi_line_off.xml @@ -5,9 +5,9 @@ - A long text on short words w/o NLs or LFs. + 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 66a5eaf220..d64d102ab8 100644 --- a/widget/testdata/entry/wrap_multi_line_truncate.xml +++ b/widget/testdata/entry/wrap_multi_line_truncate.xml @@ -6,9 +6,9 @@ - A long text on short words w/o NLs or LFs. + 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 d80eabdcc4..862225d334 100644 --- a/widget/testdata/entry/wrap_multi_line_wrap_break.xml +++ b/widget/testdata/entry/wrap_multi_line_wrap_break.xml @@ -6,11 +6,11 @@ - A long text on - short words w - /o NLs or LFs. + A long text on + short 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 45740af021..bb907a3890 100644 --- a/widget/testdata/entry/wrap_multi_line_wrap_word.xml +++ b/widget/testdata/entry/wrap_multi_line_wrap_word.xml @@ -6,12 +6,12 @@ - A long text on - short words - w/o NLs or - LFs. + A long text on + 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 c91bc9d54f..145df7a9d9 100644 --- a/widget/testdata/entry/wrap_single_line_off.xml +++ b/widget/testdata/entry/wrap_single_line_off.xml @@ -1,13 +1,13 @@ - - - - - - Testing Wrapping + + + + + + Testing Wrapping - + diff --git a/widget/testdata/entry/wrap_single_line_truncate.xml b/widget/testdata/entry/wrap_single_line_truncate.xml index c79c30b96c..fdaf16b537 100644 --- a/widget/testdata/entry/wrap_single_line_truncate.xml +++ b/widget/testdata/entry/wrap_single_line_truncate.xml @@ -1,14 +1,14 @@ - - - - - - - Testing Wrapping + + + + + + + Testing Wrapping - + diff --git a/widget/testdata/form/disable_disabled.png b/widget/testdata/form/disable_disabled.png index 70f8358511..b378fe33c3 100644 Binary files a/widget/testdata/form/disable_disabled.png and b/widget/testdata/form/disable_disabled.png differ diff --git a/widget/testdata/form/disable_initial.png b/widget/testdata/form/disable_initial.png index f112b02389..d15fbd8831 100644 Binary files a/widget/testdata/form/disable_initial.png and b/widget/testdata/form/disable_initial.png differ diff --git a/widget/testdata/form/disable_re_enabled.png b/widget/testdata/form/disable_re_enabled.png index f112b02389..d15fbd8831 100644 Binary files a/widget/testdata/form/disable_re_enabled.png and b/widget/testdata/form/disable_re_enabled.png differ diff --git a/widget/testdata/form/disable_validation_disabled_invalid.png b/widget/testdata/form/disable_validation_disabled_invalid.png index 3982761177..bea54c07dc 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_disabled_valid.png b/widget/testdata/form/disable_validation_disabled_valid.png index 440b14ca26..9ba9a0ed30 100644 Binary files a/widget/testdata/form/disable_validation_disabled_valid.png and b/widget/testdata/form/disable_validation_disabled_valid.png differ diff --git a/widget/testdata/form/disable_validation_enabled_invalid.png b/widget/testdata/form/disable_validation_enabled_invalid.png index c7fe295c40..86f08f2ef3 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_enabled_valid.png b/widget/testdata/form/disable_validation_enabled_valid.png index 289ad9a629..fab8c2d772 100644 Binary files a/widget/testdata/form/disable_validation_enabled_valid.png and b/widget/testdata/form/disable_validation_enabled_valid.png differ diff --git a/widget/testdata/form/disable_validation_initial.png b/widget/testdata/form/disable_validation_initial.png index c7fe295c40..86f08f2ef3 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 2bf5fca194..89f549e595 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 e8f443d4e7..c19cc6827d 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 f4251d9bd9..dc50f19200 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/hints_rendered.png b/widget/testdata/form/hints_rendered.png index a62a2137d2..b586b5a5ce 100644 Binary files a/widget/testdata/form/hints_rendered.png and b/widget/testdata/form/hints_rendered.png differ diff --git a/widget/testdata/form/layout.xml b/widget/testdata/form/layout.xml index 11fc78f1df..da4116d911 100644 --- a/widget/testdata/form/layout.xml +++ b/widget/testdata/form/layout.xml @@ -1,76 +1,76 @@ - + - - - - - test1 + + + + + test1 - - - - - - - + + + + + + + - - + + - - test2 + + test2 - - - - - - - + + + + + + + - - + + - - - - + + + + - - - - - + + + + + - + - Cancel - + Cancel + - - + + - - - - - + + + + + - + - Submit - + Submit + diff --git a/widget/testdata/form/theme_changed.png b/widget/testdata/form/theme_changed.png index 2c6a4111b5..00c1dd9e4a 100644 Binary files a/widget/testdata/form/theme_changed.png and b/widget/testdata/form/theme_changed.png differ diff --git a/widget/testdata/form/theme_initial.png b/widget/testdata/form/theme_initial.png index f9790c01fa..64e5c25601 100644 Binary files a/widget/testdata/form/theme_initial.png and b/widget/testdata/form/theme_initial.png differ diff --git a/widget/testdata/form/validation_entry_first_type_initial.png b/widget/testdata/form/validation_entry_first_type_initial.png index fda815f8b5..4e5f4b7b92 100644 Binary files a/widget/testdata/form/validation_entry_first_type_initial.png and b/widget/testdata/form/validation_entry_first_type_initial.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 b489ef6056..2555774c5f 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 5e4936aaf1..2b52c5a0bb 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 d10e736ae6..2587e9eb2f 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 b779680753..71f534bc01 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 a946502c48..0e64d1b1bb 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/default.xml b/widget/testdata/label/default.xml index c2fc62ab24..d2b3d29e38 100644 --- a/widget/testdata/label/default.xml +++ b/widget/testdata/label/default.xml @@ -1,7 +1,7 @@ - + - - Hello + + Hello diff --git a/widget/testdata/label/truncate.xml b/widget/testdata/label/truncate.xml index 8dd44429b8..c81819f541 100644 --- a/widget/testdata/label/truncate.xml +++ b/widget/testdata/label/truncate.xml @@ -1,7 +1,7 @@ - + - - Hel + + Hel diff --git a/widget/testdata/list/initial.xml b/widget/testdata/list/initial.xml index 962c7423f1..2790fd4741 100644 --- a/widget/testdata/list/initial.xml +++ b/widget/testdata/list/initial.xml @@ -2,161 +2,161 @@ - - - - - + + + + + - - Test Item 0 + + Test Item 0 - - - - + + + + - - Test Item 1 + + Test Item 1 - - - - + + + + - - Test Item 2 + + Test Item 2 - - - - + + + + - - Test Item 3 + + Test Item 3 - - - - + + + + - - Test Item 4 + + Test Item 4 - - - - + + + + - - Test Item 5 + + Test Item 5 - - - - + + + + - - Test Item 6 + + Test Item 6 - - - - + + + + - - Test Item 7 + + Test Item 7 - - - - + + + + - - Test Item 8 + + Test Item 8 - - - - + + + + - - Test Item 9 + + Test Item 9 - - - - + + + + - - Test Item 10 + + Test Item 10 - - - - + + + + - - Test Item 11 + + Test Item 11 - + - + - + - + - + - + - + - + - + - + - + diff --git a/widget/testdata/list/item_removed.xml b/widget/testdata/list/item_removed.xml index 71c1dea5fa..8ca22a5caa 100644 --- a/widget/testdata/list/item_removed.xml +++ b/widget/testdata/list/item_removed.xml @@ -3,30 +3,30 @@ - - - - + + + + - - Test Item 0 + + Test Item 0 - - - - + + + + - - Test Item 1 + + Test Item 1 - + diff --git a/widget/testdata/list/list_initial.png b/widget/testdata/list/list_initial.png index bf8ef41afe..354d4bcfb1 100644 Binary files a/widget/testdata/list/list_initial.png and b/widget/testdata/list/list_initial.png differ diff --git a/widget/testdata/list/list_theme_changed.png b/widget/testdata/list/list_theme_changed.png index 363a130ce9..a07e6880af 100644 Binary files a/widget/testdata/list/list_theme_changed.png and b/widget/testdata/list/list_theme_changed.png differ diff --git a/widget/testdata/list/new_data.xml b/widget/testdata/list/new_data.xml index dde58f67fe..083e740752 100644 --- a/widget/testdata/list/new_data.xml +++ b/widget/testdata/list/new_data.xml @@ -2,167 +2,167 @@ - - - - - + + + + + - - a + + a - - - - + + + + - - b + + b - - - - + + + + - - c + + c - - - - + + + + - - d + + d - - - - + + + + - - e + + e - - - - + + + + - - f + + f - - - - + + + + - - g + + g - - - - + + + + - - h + + h - - - - + + + + - - i + + i - - - - + + + + - - j + + j - - - - + + + + - - k + + k - - - - + + + + - - l + + l - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/widget/testdata/list/offset_changed.xml b/widget/testdata/list/offset_changed.xml index fb687b70dc..280a42ac00 100644 --- a/widget/testdata/list/offset_changed.xml +++ b/widget/testdata/list/offset_changed.xml @@ -2,161 +2,161 @@ - - - - - + + + + + - - Test Item 7 + + Test Item 6 - - - - + + + + - - Test Item 8 + + Test Item 7 - - - - + + + + - - Test Item 9 + + Test Item 8 - - - - + + + + - - Test Item 10 + + Test Item 9 - - - - + + + + - - Test Item 11 + + Test Item 10 - - - - + + + + - - Test Item 12 + + Test Item 11 - - - - + + + + - - Test Item 13 + + Test Item 12 - - - - + + + + - - Test Item 14 + + Test Item 13 - - - - + + + + - - Test Item 15 + + Test Item 14 - - - - + + + + - - Test Item 16 + + Test Item 15 - - - - + + + + - - Test Item 17 + + Test Item 16 - - - - + + + + - - Test Item 18 + + Test Item 17 - + - + - + - + - + - + - + - + - + - + - + diff --git a/widget/testdata/list/resized.xml b/widget/testdata/list/resized.xml index 0377ddc87d..dbc99bf927 100644 --- a/widget/testdata/list/resized.xml +++ b/widget/testdata/list/resized.xml @@ -2,226 +2,226 @@ - - - - - + + + + + - - Test Item 0 + + Test Item 0 - - - - + + + + - - Test Item 1 + + Test Item 1 - - - - + + + + - - Test Item 2 + + Test Item 2 - - - - + + + + - - Test Item 3 + + Test Item 3 - - - - + + + + - - Test Item 4 + + Test Item 4 - - - - + + + + - - Test Item 5 + + Test Item 5 - - - - + + + + - - Test Item 6 + + Test Item 6 - - - - + + + + - - Test Item 7 + + Test Item 7 - - - - + + + + - - Test Item 8 + + Test Item 8 - - - - + + + + - - Test Item 9 + + Test Item 9 - - - - + + + + - - Test Item 10 + + Test Item 10 - - - - + + + + - - Test Item 11 + + Test Item 11 - - - - + + + + - - Test Item 12 + + Test Item 12 - - - - + + + + - - Test Item 13 + + Test Item 13 - - - - + + + + - - Test Item 14 + + Test Item 14 - - - - + + + + - - Test Item 15 + + Test Item 15 - - - - + + + + - - Test Item 16 + + Test Item 16 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/widget/testdata/list/small.xml b/widget/testdata/list/small.xml index c215020867..ba7be2b20f 100644 --- a/widget/testdata/list/small.xml +++ b/widget/testdata/list/small.xml @@ -3,30 +3,30 @@ - - - - + + + + - - Test Item 0 + + Test Item 0 - - - - + + + + - - Test Item 1 + + Test Item 1 - + diff --git a/widget/testdata/menu/desktop/layout_background_reset.xml b/widget/testdata/menu/desktop/layout_background_reset.xml index 1ae27b378a..a5f07072d8 100644 --- a/widget/testdata/menu/desktop/layout_background_reset.xml +++ b/widget/testdata/menu/desktop/layout_background_reset.xml @@ -4,34 +4,34 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - - B (long) + + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/desktop/layout_no_space_on_both_sides.xml b/widget/testdata/menu/desktop/layout_no_space_on_both_sides.xml index 2e0c6f1219..9cff9b3c75 100644 --- a/widget/testdata/menu/desktop/layout_no_space_on_both_sides.xml +++ b/widget/testdata/menu/desktop/layout_no_space_on_both_sides.xml @@ -4,87 +4,87 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - - C - + + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - - subitem C (long) - + + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/desktop/layout_no_space_on_right.xml b/widget/testdata/menu/desktop/layout_no_space_on_right.xml index b0f07c178f..7e4692e634 100644 --- a/widget/testdata/menu/desktop/layout_no_space_on_right.xml +++ b/widget/testdata/menu/desktop/layout_no_space_on_right.xml @@ -4,87 +4,87 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - - C - + + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - - subitem C (long) - + + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/desktop/layout_normal.xml b/widget/testdata/menu/desktop/layout_normal.xml index 1ce9d74b5f..97c6e13eed 100644 --- a/widget/testdata/menu/desktop/layout_normal.xml +++ b/widget/testdata/menu/desktop/layout_normal.xml @@ -4,33 +4,33 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/desktop/layout_normal_with_submenus.xml b/widget/testdata/menu/desktop/layout_normal_with_submenus.xml index 0db4ca290d..4d6f4fd3f0 100644 --- a/widget/testdata/menu/desktop/layout_normal_with_submenus.xml +++ b/widget/testdata/menu/desktop/layout_normal_with_submenus.xml @@ -4,87 +4,87 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - - C - + + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - - subitem C (long) - + + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/desktop/layout_theme_changed.xml b/widget/testdata/menu/desktop/layout_theme_changed.xml index 1ce9d74b5f..97c6e13eed 100644 --- a/widget/testdata/menu/desktop/layout_theme_changed.xml +++ b/widget/testdata/menu/desktop/layout_theme_changed.xml @@ -4,33 +4,33 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/desktop/layout_window_too_short.xml b/widget/testdata/menu/desktop/layout_window_too_short.xml index b660ad083b..32b2f9c64f 100644 --- a/widget/testdata/menu/desktop/layout_window_too_short.xml +++ b/widget/testdata/menu/desktop/layout_window_too_short.xml @@ -4,43 +4,43 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - + - - + + diff --git a/widget/testdata/menu/desktop/layout_window_too_short_for_submenu.xml b/widget/testdata/menu/desktop/layout_window_too_short_for_submenu.xml index 5137706b15..03ad5575ca 100644 --- a/widget/testdata/menu/desktop/layout_window_too_short_for_submenu.xml +++ b/widget/testdata/menu/desktop/layout_window_too_short_for_submenu.xml @@ -4,87 +4,87 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - - C - + + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - - subitem C (long) - + + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/desktop/refresh_2nd_checkmark.xml b/widget/testdata/menu/desktop/refresh_2nd_checkmark.xml index f87ecd7ff6..c757b71695 100644 --- a/widget/testdata/menu/desktop/refresh_2nd_checkmark.xml +++ b/widget/testdata/menu/desktop/refresh_2nd_checkmark.xml @@ -1,36 +1,36 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar + + Bar - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/refresh_checkmark.xml b/widget/testdata/menu/desktop/refresh_checkmark.xml index 3863597172..45c76c992e 100644 --- a/widget/testdata/menu/desktop/refresh_checkmark.xml +++ b/widget/testdata/menu/desktop/refresh_checkmark.xml @@ -1,35 +1,35 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar + + Bar - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/refresh_disabled.xml b/widget/testdata/menu/desktop/refresh_disabled.xml index e622a64cc6..bbd37dab32 100644 --- a/widget/testdata/menu/desktop/refresh_disabled.xml +++ b/widget/testdata/menu/desktop/refresh_disabled.xml @@ -1,35 +1,35 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar + + Bar - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/refresh_initial.xml b/widget/testdata/menu/desktop/refresh_initial.xml index 2e833d399b..aa7b94df56 100644 --- a/widget/testdata/menu/desktop/refresh_initial.xml +++ b/widget/testdata/menu/desktop/refresh_initial.xml @@ -1,35 +1,35 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar + + Bar - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/scroll_bottom.xml b/widget/testdata/menu/desktop/scroll_bottom.xml index 289b3256a0..56afe3b968 100644 --- a/widget/testdata/menu/desktop/scroll_bottom.xml +++ b/widget/testdata/menu/desktop/scroll_bottom.xml @@ -4,48 +4,48 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + diff --git a/widget/testdata/menu/desktop/scroll_middle.xml b/widget/testdata/menu/desktop/scroll_middle.xml index 8d36554f3a..08abe97a1e 100644 --- a/widget/testdata/menu/desktop/scroll_middle.xml +++ b/widget/testdata/menu/desktop/scroll_middle.xml @@ -4,51 +4,51 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + - - + + diff --git a/widget/testdata/menu/desktop/scroll_top.xml b/widget/testdata/menu/desktop/scroll_top.xml index 88b592b9de..fb34e180f9 100644 --- a/widget/testdata/menu/desktop/scroll_top.xml +++ b/widget/testdata/menu/desktop/scroll_top.xml @@ -4,48 +4,48 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + diff --git a/widget/testdata/menu/desktop/traverse_first_active.xml b/widget/testdata/menu/desktop/traverse_first_active.xml index 43e398126f..842756ccbc 100644 --- a/widget/testdata/menu/desktop/traverse_first_active.xml +++ b/widget/testdata/menu/desktop/traverse_first_active.xml @@ -1,37 +1,37 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - - Foo + + + + + + + Foo - - + + - - Bar - + + Bar + - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/traverse_initial.xml b/widget/testdata/menu/desktop/traverse_initial.xml index 0f994c56de..1a4a7de66d 100644 --- a/widget/testdata/menu/desktop/traverse_initial.xml +++ b/widget/testdata/menu/desktop/traverse_initial.xml @@ -1,36 +1,36 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar - + + Bar + - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/traverse_second_active.xml b/widget/testdata/menu/desktop/traverse_second_active.xml index 708b14a275..194823a9b6 100644 --- a/widget/testdata/menu/desktop/traverse_second_active.xml +++ b/widget/testdata/menu/desktop/traverse_second_active.xml @@ -1,37 +1,37 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - - Bar - + + + Bar + - - + + - - Baz + + Baz diff --git a/widget/testdata/menu/desktop/traverse_submenu_first_active.xml b/widget/testdata/menu/desktop/traverse_submenu_first_active.xml index 3b609dc41a..a90b7aa233 100644 --- a/widget/testdata/menu/desktop/traverse_submenu_first_active.xml +++ b/widget/testdata/menu/desktop/traverse_submenu_first_active.xml @@ -1,62 +1,62 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - - Bar - + + + Bar + - - + + - - Baz + + Baz - - + + - - - - - - - + + + + + + + - - - - - - - SubA + + + + + + + SubA - - SubB + + SubB diff --git a/widget/testdata/menu/desktop/traverse_submenu_second_active.xml b/widget/testdata/menu/desktop/traverse_submenu_second_active.xml index cfe0c1c070..17ccf82e6d 100644 --- a/widget/testdata/menu/desktop/traverse_submenu_second_active.xml +++ b/widget/testdata/menu/desktop/traverse_submenu_second_active.xml @@ -1,62 +1,62 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - - Bar - + + + Bar + - - + + - - Baz + + Baz - - + + - - - - - - - + + + + + + + - - - - - - SubA + + + + + + SubA - - - SubB + + + SubB diff --git a/widget/testdata/menu/desktop/traverse_third_active.xml b/widget/testdata/menu/desktop/traverse_third_active.xml index 51daccc009..37ed3bdc9c 100644 --- a/widget/testdata/menu/desktop/traverse_third_active.xml +++ b/widget/testdata/menu/desktop/traverse_third_active.xml @@ -1,37 +1,37 @@ - + - - - + + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - + + - - Bar - + + Bar + - - + + - - - Baz + + + Baz diff --git a/widget/testdata/menu/layout_normal.png b/widget/testdata/menu/layout_normal.png index 748109011f..bc9e8a876d 100644 Binary files a/widget/testdata/menu/layout_normal.png and b/widget/testdata/menu/layout_normal.png differ diff --git a/widget/testdata/menu/layout_theme_changed.png b/widget/testdata/menu/layout_theme_changed.png index 66e88a0eb7..35e54790aa 100644 Binary files a/widget/testdata/menu/layout_theme_changed.png and b/widget/testdata/menu/layout_theme_changed.png differ diff --git a/widget/testdata/menu/mobile/drag_bottom.xml b/widget/testdata/menu/mobile/drag_bottom.xml index 289b3256a0..56afe3b968 100644 --- a/widget/testdata/menu/mobile/drag_bottom.xml +++ b/widget/testdata/menu/mobile/drag_bottom.xml @@ -4,48 +4,48 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + diff --git a/widget/testdata/menu/mobile/drag_middle.xml b/widget/testdata/menu/mobile/drag_middle.xml index 8d36554f3a..08abe97a1e 100644 --- a/widget/testdata/menu/mobile/drag_middle.xml +++ b/widget/testdata/menu/mobile/drag_middle.xml @@ -4,51 +4,51 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + - - + + diff --git a/widget/testdata/menu/mobile/drag_top.xml b/widget/testdata/menu/mobile/drag_top.xml index 88b592b9de..fb34e180f9 100644 --- a/widget/testdata/menu/mobile/drag_top.xml +++ b/widget/testdata/menu/mobile/drag_top.xml @@ -4,48 +4,48 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C - - D + + D - - E + + E - - F + + F - + - - + + diff --git a/widget/testdata/menu/mobile/layout_background_reset.xml b/widget/testdata/menu/mobile/layout_background_reset.xml index 1ce9d74b5f..97c6e13eed 100644 --- a/widget/testdata/menu/mobile/layout_background_reset.xml +++ b/widget/testdata/menu/mobile/layout_background_reset.xml @@ -4,33 +4,33 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/mobile/layout_no_space_on_both_sides.xml b/widget/testdata/menu/mobile/layout_no_space_on_both_sides.xml index e5ac53f3d1..408df50f08 100644 --- a/widget/testdata/menu/mobile/layout_no_space_on_both_sides.xml +++ b/widget/testdata/menu/mobile/layout_no_space_on_both_sides.xml @@ -4,85 +4,85 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - subitem C (long) - + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/mobile/layout_no_space_on_right.xml b/widget/testdata/menu/mobile/layout_no_space_on_right.xml index da42e5ad26..bee38ca1c3 100644 --- a/widget/testdata/menu/mobile/layout_no_space_on_right.xml +++ b/widget/testdata/menu/mobile/layout_no_space_on_right.xml @@ -4,85 +4,85 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - subitem C (long) - + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/mobile/layout_normal.xml b/widget/testdata/menu/mobile/layout_normal.xml index 1ce9d74b5f..97c6e13eed 100644 --- a/widget/testdata/menu/mobile/layout_normal.xml +++ b/widget/testdata/menu/mobile/layout_normal.xml @@ -4,33 +4,33 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/mobile/layout_normal_with_submenus.xml b/widget/testdata/menu/mobile/layout_normal_with_submenus.xml index e3907f7da1..ea6e400222 100644 --- a/widget/testdata/menu/mobile/layout_normal_with_submenus.xml +++ b/widget/testdata/menu/mobile/layout_normal_with_submenus.xml @@ -4,85 +4,85 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - subitem C (long) - + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/menu/mobile/layout_theme_changed.xml b/widget/testdata/menu/mobile/layout_theme_changed.xml index 1ce9d74b5f..97c6e13eed 100644 --- a/widget/testdata/menu/mobile/layout_theme_changed.xml +++ b/widget/testdata/menu/mobile/layout_theme_changed.xml @@ -4,33 +4,33 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + diff --git a/widget/testdata/menu/mobile/layout_window_too_short.xml b/widget/testdata/menu/mobile/layout_window_too_short.xml index b660ad083b..32b2f9c64f 100644 --- a/widget/testdata/menu/mobile/layout_window_too_short.xml +++ b/widget/testdata/menu/mobile/layout_window_too_short.xml @@ -4,43 +4,43 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - + - - + + diff --git a/widget/testdata/menu/mobile/layout_window_too_short_for_submenu.xml b/widget/testdata/menu/mobile/layout_window_too_short_for_submenu.xml index d9525e1fea..8808f93324 100644 --- a/widget/testdata/menu/mobile/layout_window_too_short_for_submenu.xml +++ b/widget/testdata/menu/mobile/layout_window_too_short_for_submenu.xml @@ -4,85 +4,85 @@ - - + + - - - - - - - + + + + + + + - - - - - - A + + + + + + A - - + + - - B (long) + + B (long) - - C - + + C + - - + + - - - - - - - + + + + + + + - - - - - - subitem A + + + + + + subitem A - - subitem B + + subitem B - - subitem C (long) - + + subitem C (long) + - - + + - - - - - - - + + + + + + + - - - - - - subsubitem A (long) + + + + + + subsubitem A (long) - - subsubitem B + + subsubitem B diff --git a/widget/testdata/password_entry/concealed.xml b/widget/testdata/password_entry/concealed.xml index 8c97f33f67..e91439a20d 100644 --- a/widget/testdata/password_entry/concealed.xml +++ b/widget/testdata/password_entry/concealed.xml @@ -1,14 +1,14 @@ - - - - - - - ••••••• + + + + + + + ••••••• - + diff --git a/widget/testdata/password_entry/initial.xml b/widget/testdata/password_entry/initial.xml index 98de48d4ed..6832623fc0 100644 --- a/widget/testdata/password_entry/initial.xml +++ b/widget/testdata/password_entry/initial.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/password_entry/obfuscation_typed.xml b/widget/testdata/password_entry/obfuscation_typed.xml index 8c97f33f67..e91439a20d 100644 --- a/widget/testdata/password_entry/obfuscation_typed.xml +++ b/widget/testdata/password_entry/obfuscation_typed.xml @@ -1,14 +1,14 @@ - - - - - - - ••••••• + + + + + + + ••••••• - + diff --git a/widget/testdata/password_entry/placeholder_initial.xml b/widget/testdata/password_entry/placeholder_initial.xml index bd14fbe6e1..e22a6ec3b2 100644 --- a/widget/testdata/password_entry/placeholder_initial.xml +++ b/widget/testdata/password_entry/placeholder_initial.xml @@ -1,15 +1,15 @@ - - - - - - - Password + + + + + + + Password - - + + diff --git a/widget/testdata/password_entry/placeholder_typed.xml b/widget/testdata/password_entry/placeholder_typed.xml index 8c97f33f67..e91439a20d 100644 --- a/widget/testdata/password_entry/placeholder_typed.xml +++ b/widget/testdata/password_entry/placeholder_typed.xml @@ -1,14 +1,14 @@ - - - - - - - ••••••• + + + + + + + ••••••• - + diff --git a/widget/testdata/password_entry/revealed.xml b/widget/testdata/password_entry/revealed.xml index 55119eb515..502b3b32c7 100644 --- a/widget/testdata/password_entry/revealed.xml +++ b/widget/testdata/password_entry/revealed.xml @@ -1,14 +1,14 @@ - - - - - - - Hié™שרה + + + + + + + Hié™שרה - + diff --git a/widget/testdata/popup/modal-onshow-theme-changed.png b/widget/testdata/popup/modal-onshow-theme-changed.png index 16f4f596fa..8d742c4377 100644 Binary files a/widget/testdata/popup/modal-onshow-theme-changed.png and b/widget/testdata/popup/modal-onshow-theme-changed.png differ diff --git a/widget/testdata/popup/modal-onshow-theme-default.png b/widget/testdata/popup/modal-onshow-theme-default.png index 6d5b4ab05b..8edbb21b3c 100644 Binary files a/widget/testdata/popup/modal-onshow-theme-default.png and b/widget/testdata/popup/modal-onshow-theme-default.png differ diff --git a/widget/testdata/popup/modal.xml b/widget/testdata/popup/modal.xml index 4e1dc93b03..b10a740fb9 100644 --- a/widget/testdata/popup/modal.xml +++ b/widget/testdata/popup/modal.xml @@ -4,20 +4,20 @@ - + - - - - - - - + + + + + + + - - - Hi + + + Hi diff --git a/widget/testdata/popup/normal-onshow-theme-changed.png b/widget/testdata/popup/normal-onshow-theme-changed.png index 6d55f0e0c7..fe944ce86c 100644 Binary files a/widget/testdata/popup/normal-onshow-theme-changed.png and b/widget/testdata/popup/normal-onshow-theme-changed.png differ diff --git a/widget/testdata/popup/normal-onshow-theme-default.png b/widget/testdata/popup/normal-onshow-theme-default.png index 6eb39805cf..08045de33f 100644 Binary files a/widget/testdata/popup/normal-onshow-theme-default.png and b/widget/testdata/popup/normal-onshow-theme-default.png differ diff --git a/widget/testdata/popup/normal.xml b/widget/testdata/popup/normal.xml index 84c5ee792a..34cc68d4f9 100644 --- a/widget/testdata/popup/normal.xml +++ b/widget/testdata/popup/normal.xml @@ -4,19 +4,19 @@ - + - - - - - - - + + + + + + + - - - Hi + + + Hi diff --git a/widget/testdata/popup_menu/canvas_too_small.xml b/widget/testdata/popup_menu/canvas_too_small.xml index 03e89850fc..f0000626dc 100644 --- a/widget/testdata/popup_menu/canvas_too_small.xml +++ b/widget/testdata/popup_menu/canvas_too_small.xml @@ -19,11 +19,11 @@ - - Option A + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml index fee326f850..4c971589d3 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml @@ -4,28 +4,28 @@ - - + + - - - - - - - + + + + + + + - - - - - - - Option A + + + + + + + Option A - - Option B - + + Option B + diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_active.xml index a0050cfac6..d7f770cd17 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_active.xml @@ -4,54 +4,54 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - - Option B - + + + Option B + - - + + - - - - - - - + + + + + + + - - - - - - - Sub Option A + + + + + + + Sub Option A - - Sub Option B - + + Sub Option B + diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_sub_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_sub_active.xml index c2861d9563..df819d6fb9 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_sub_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_sub_sub_active.xml @@ -4,79 +4,79 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - - Option B - + + + Option B + - - + + - - - - - - - + + + + + + + - - - - - - Sub Option A + + + + + + Sub Option A - - - Sub Option B - + + + Sub Option B + - - + + - - - - - - - + + + + + + + - - - - - - - Sub Sub Option A + + + + + + + Sub Sub Option A - - Sub Sub Option B + + Sub Sub Option B diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml index 990b34eacd..43574b7736 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml @@ -4,28 +4,28 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - - Option B - + + + Option B + diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_active.xml index 5d8c666ed4..293361377f 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_active.xml @@ -4,54 +4,54 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - - Option B - + + + Option B + - - + + - - - - - - - + + + + + + + - - - - - - Sub Option A + + + + + + Sub Option A - - - Sub Option B - + + + Sub Option B + diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_sub_active.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_sub_active.xml index f87a798741..2b261f2f24 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_sub_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_sub_sub_active.xml @@ -4,79 +4,79 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - - Option B - + + + Option B + - - + + - - - - - - - + + + + + + + - - - - - - Sub Option A + + + + + + Sub Option A - - - Sub Option B - + + + Sub Option B + - - + + - - - - - - - + + + + + + + - - - - - - Sub Sub Option A + + + + + + Sub Sub Option A - - - Sub Sub Option B + + + Sub Sub Option B diff --git a/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml b/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml index ba10775b21..2a7defa4cc 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml @@ -4,27 +4,27 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B - + + Option B + diff --git a/widget/testdata/popup_menu/grown.xml b/widget/testdata/popup_menu/grown.xml index 8adf0fcf61..6f5ba68acc 100644 --- a/widget/testdata/popup_menu/grown.xml +++ b/widget/testdata/popup_menu/grown.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/moved.xml b/widget/testdata/popup_menu/moved.xml index 10ca34f13a..35afbd0e6c 100644 --- a/widget/testdata/popup_menu/moved.xml +++ b/widget/testdata/popup_menu/moved.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/no_space_down.xml b/widget/testdata/popup_menu/no_space_down.xml index e6dc85ca0f..e5174752cd 100644 --- a/widget/testdata/popup_menu/no_space_down.xml +++ b/widget/testdata/popup_menu/no_space_down.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/no_space_right.xml b/widget/testdata/popup_menu/no_space_right.xml index 60275c7a55..fbdb55134b 100644 --- a/widget/testdata/popup_menu/no_space_right.xml +++ b/widget/testdata/popup_menu/no_space_right.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/shown.xml b/widget/testdata/popup_menu/shown.xml index c9c9a9f4d4..a6e7af2138 100644 --- a/widget/testdata/popup_menu/shown.xml +++ b/widget/testdata/popup_menu/shown.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/popup_menu/shown_at_pos.xml b/widget/testdata/popup_menu/shown_at_pos.xml index a03eb598a1..22cf49af37 100644 --- a/widget/testdata/popup_menu/shown_at_pos.xml +++ b/widget/testdata/popup_menu/shown_at_pos.xml @@ -4,26 +4,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/radio_group/disabled_append_none_selected.xml b/widget/testdata/radio_group/disabled_append_none_selected.xml index e32bd9221e..14c462c523 100644 --- a/widget/testdata/radio_group/disabled_append_none_selected.xml +++ b/widget/testdata/radio_group/disabled_append_none_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/disabled_none_selected.xml b/widget/testdata/radio_group/disabled_none_selected.xml index 1491b29ef6..50121e05d6 100644 --- a/widget/testdata/radio_group/disabled_none_selected.xml +++ b/widget/testdata/radio_group/disabled_none_selected.xml @@ -1,16 +1,16 @@ - - + + - Option A + Option A - + - Option B + Option B 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 8f9e825fe5..e9c0c92ee7 100644 --- a/widget/testdata/radio_group/focus_a_focused_b_selected.xml +++ b/widget/testdata/radio_group/focus_a_focused_b_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/focus_a_focused_none_selected.xml b/widget/testdata/radio_group/focus_a_focused_none_selected.xml index 3757dc8355..d9680e0884 100644 --- a/widget/testdata/radio_group/focus_a_focused_none_selected.xml +++ b/widget/testdata/radio_group/focus_a_focused_none_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C 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 b4ea23ccfb..aceafba582 100644 --- a/widget/testdata/radio_group/focus_b_focused_b_selected.xml +++ b/widget/testdata/radio_group/focus_b_focused_b_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/focus_b_focused_none_selected.xml b/widget/testdata/radio_group/focus_b_focused_none_selected.xml index 8955238414..4df09712b4 100644 --- a/widget/testdata/radio_group/focus_b_focused_none_selected.xml +++ b/widget/testdata/radio_group/focus_b_focused_none_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/focus_disabled_none_selected.xml b/widget/testdata/radio_group/focus_disabled_none_selected.xml index 56732f9c91..6eb6a87b63 100644 --- a/widget/testdata/radio_group/focus_disabled_none_selected.xml +++ b/widget/testdata/radio_group/focus_disabled_none_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C 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 8f014e4faa..1415b111a7 100644 --- a/widget/testdata/radio_group/focus_none_focused_b_selected.xml +++ b/widget/testdata/radio_group/focus_none_focused_b_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/focus_none_focused_none_selected.xml b/widget/testdata/radio_group/focus_none_focused_none_selected.xml index d8cf40d2e9..e4033d6a8c 100644 --- a/widget/testdata/radio_group/focus_none_focused_none_selected.xml +++ b/widget/testdata/radio_group/focus_none_focused_none_selected.xml @@ -1,21 +1,21 @@ - - + + - Option A + Option A - + - Option B + Option B - + - Option C + Option C diff --git a/widget/testdata/radio_group/layout_multiple.xml b/widget/testdata/radio_group/layout_multiple.xml index 2d964ba03a..ca8acfa278 100644 --- a/widget/testdata/radio_group/layout_multiple.xml +++ b/widget/testdata/radio_group/layout_multiple.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_disabled.xml b/widget/testdata/radio_group/layout_multiple_disabled.xml index 1ba5ec9525..2c51b3a9c5 100644 --- a/widget/testdata/radio_group/layout_multiple_disabled.xml +++ b/widget/testdata/radio_group/layout_multiple_disabled.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_horizontal.xml b/widget/testdata/radio_group/layout_multiple_horizontal.xml index e68e5bca4a..9309e3a8f9 100644 --- a/widget/testdata/radio_group/layout_multiple_horizontal.xml +++ b/widget/testdata/radio_group/layout_multiple_horizontal.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_horizontal_disabled.xml b/widget/testdata/radio_group/layout_multiple_horizontal_disabled.xml index efe8e130b1..40d7cf3be2 100644 --- a/widget/testdata/radio_group/layout_multiple_horizontal_disabled.xml +++ b/widget/testdata/radio_group/layout_multiple_horizontal_disabled.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_selected.xml b/widget/testdata/radio_group/layout_multiple_selected.xml index 2195fe95ea..04f9430952 100644 --- a/widget/testdata/radio_group/layout_multiple_selected.xml +++ b/widget/testdata/radio_group/layout_multiple_selected.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_selected_disabled.xml b/widget/testdata/radio_group/layout_multiple_selected_disabled.xml index 75c1d7a15b..eabbdc9c1a 100644 --- a/widget/testdata/radio_group/layout_multiple_selected_disabled.xml +++ b/widget/testdata/radio_group/layout_multiple_selected_disabled.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml b/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml index e5ffb7795e..ad17604002 100644 --- a/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml +++ b/widget/testdata/radio_group/layout_multiple_selected_horizontal.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_multiple_selected_horizontal_disabled.xml b/widget/testdata/radio_group/layout_multiple_selected_horizontal_disabled.xml index 30d07a9850..b21f594fe1 100644 --- a/widget/testdata/radio_group/layout_multiple_selected_horizontal_disabled.xml +++ b/widget/testdata/radio_group/layout_multiple_selected_horizontal_disabled.xml @@ -1,16 +1,16 @@ - - + + - Foo + Foo - + - Bar + Bar diff --git a/widget/testdata/radio_group/layout_single.xml b/widget/testdata/radio_group/layout_single.xml index 94df4e8d78..45faa6bf65 100644 --- a/widget/testdata/radio_group/layout_single.xml +++ b/widget/testdata/radio_group/layout_single.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_disabled.xml b/widget/testdata/radio_group/layout_single_disabled.xml index 944ef673a6..3eda74e6a0 100644 --- a/widget/testdata/radio_group/layout_single_disabled.xml +++ b/widget/testdata/radio_group/layout_single_disabled.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_horizontal.xml b/widget/testdata/radio_group/layout_single_horizontal.xml index 94df4e8d78..45faa6bf65 100644 --- a/widget/testdata/radio_group/layout_single_horizontal.xml +++ b/widget/testdata/radio_group/layout_single_horizontal.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_horizontal_disabled.xml b/widget/testdata/radio_group/layout_single_horizontal_disabled.xml index 944ef673a6..3eda74e6a0 100644 --- a/widget/testdata/radio_group/layout_single_horizontal_disabled.xml +++ b/widget/testdata/radio_group/layout_single_horizontal_disabled.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_selected.xml b/widget/testdata/radio_group/layout_single_selected.xml index 200cc512c3..6a68e7e857 100644 --- a/widget/testdata/radio_group/layout_single_selected.xml +++ b/widget/testdata/radio_group/layout_single_selected.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_selected_disabled.xml b/widget/testdata/radio_group/layout_single_selected_disabled.xml index 8b1dd0eba8..6070c31625 100644 --- a/widget/testdata/radio_group/layout_single_selected_disabled.xml +++ b/widget/testdata/radio_group/layout_single_selected_disabled.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_selected_horizontal.xml b/widget/testdata/radio_group/layout_single_selected_horizontal.xml index 200cc512c3..6a68e7e857 100644 --- a/widget/testdata/radio_group/layout_single_selected_horizontal.xml +++ b/widget/testdata/radio_group/layout_single_selected_horizontal.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/radio_group/layout_single_selected_horizontal_disabled.xml b/widget/testdata/radio_group/layout_single_selected_horizontal_disabled.xml index 8b1dd0eba8..6070c31625 100644 --- a/widget/testdata/radio_group/layout_single_selected_horizontal_disabled.xml +++ b/widget/testdata/radio_group/layout_single_selected_horizontal_disabled.xml @@ -1,11 +1,11 @@ - - + + - Test + Test diff --git a/widget/testdata/select/disabled.xml b/widget/testdata/select/disabled.xml index 446cb800e7..2a060e970a 100644 --- a/widget/testdata/select/disabled.xml +++ b/widget/testdata/select/disabled.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/focus_focused_b_selected.xml b/widget/testdata/select/focus_focused_b_selected.xml index 5e3767524e..886d66925f 100644 --- a/widget/testdata/select/focus_focused_b_selected.xml +++ b/widget/testdata/select/focus_focused_b_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Option B + + Option B - + diff --git a/widget/testdata/select/focus_focused_none_selected.xml b/widget/testdata/select/focus_focused_none_selected.xml index 93068959a1..50996a3227 100644 --- a/widget/testdata/select/focus_focused_none_selected.xml +++ b/widget/testdata/select/focus_focused_none_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/focus_unfocused_b_selected.xml b/widget/testdata/select/focus_unfocused_b_selected.xml index 738daf5f20..9090ee3fa9 100644 --- a/widget/testdata/select/focus_unfocused_b_selected.xml +++ b/widget/testdata/select/focus_unfocused_b_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Option B + + Option B - + diff --git a/widget/testdata/select/focus_unfocused_none_selected.xml b/widget/testdata/select/focus_unfocused_none_selected.xml index 62c78ee170..3470f4059c 100644 --- a/widget/testdata/select/focus_unfocused_none_selected.xml +++ b/widget/testdata/select/focus_unfocused_none_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/kbdctrl_a_selected.xml b/widget/testdata/select/kbdctrl_a_selected.xml index 571e14cc45..c40264cc40 100644 --- a/widget/testdata/select/kbdctrl_a_selected.xml +++ b/widget/testdata/select/kbdctrl_a_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Option A + + Option A - + diff --git a/widget/testdata/select/kbdctrl_b_selected.xml b/widget/testdata/select/kbdctrl_b_selected.xml index cea0d6536c..a7a6ee3b7a 100644 --- a/widget/testdata/select/kbdctrl_b_selected.xml +++ b/widget/testdata/select/kbdctrl_b_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Option B + + Option B - + diff --git a/widget/testdata/select/kbdctrl_c_selected.xml b/widget/testdata/select/kbdctrl_c_selected.xml index 1890b91d63..ee69a47335 100644 --- a/widget/testdata/select/kbdctrl_c_selected.xml +++ b/widget/testdata/select/kbdctrl_c_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Option C + + Option C - + diff --git a/widget/testdata/select/kbdctrl_none_selected.xml b/widget/testdata/select/kbdctrl_none_selected.xml index 244b1a5e19..dcc17ac081 100644 --- a/widget/testdata/select/kbdctrl_none_selected.xml +++ b/widget/testdata/select/kbdctrl_none_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/kbdctrl_none_selected_popup.xml b/widget/testdata/select/kbdctrl_none_selected_popup.xml index 6123ea6da1..563a135213 100644 --- a/widget/testdata/select/kbdctrl_none_selected_popup.xml +++ b/widget/testdata/select/kbdctrl_none_selected_popup.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + @@ -16,26 +16,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Option A + + + + + + Option A - - Option B + + Option B diff --git a/widget/testdata/select/layout_empty.xml b/widget/testdata/select/layout_empty.xml index 07d38d8c8e..f14f01040e 100644 --- a/widget/testdata/select/layout_empty.xml +++ b/widget/testdata/select/layout_empty.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/layout_empty_expanded.xml b/widget/testdata/select/layout_empty_expanded.xml index c09454c4b9..c8b34694e3 100644 --- a/widget/testdata/select/layout_empty_expanded.xml +++ b/widget/testdata/select/layout_empty_expanded.xml @@ -1,14 +1,14 @@ - - - - - - (Select one) + + + + + + (Select one) - + @@ -16,21 +16,21 @@ - - + + - - - - - + + + + + - - - - + + + + diff --git a/widget/testdata/select/layout_empty_expanded_placeholder.xml b/widget/testdata/select/layout_empty_expanded_placeholder.xml index e999f15e80..ec1dc3b387 100644 --- a/widget/testdata/select/layout_empty_expanded_placeholder.xml +++ b/widget/testdata/select/layout_empty_expanded_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - (Pick 1) + + + + + + (Pick 1) - + @@ -16,21 +16,21 @@ - - + + - - - - - + + + + + - - - - + + + + diff --git a/widget/testdata/select/layout_empty_placeholder.xml b/widget/testdata/select/layout_empty_placeholder.xml index b977692cc2..642ea2ffdc 100644 --- a/widget/testdata/select/layout_empty_placeholder.xml +++ b/widget/testdata/select/layout_empty_placeholder.xml @@ -1,14 +1,14 @@ - - - + + + - - (Pick 1) + + (Pick 1) - + diff --git a/widget/testdata/select/layout_multiple.xml b/widget/testdata/select/layout_multiple.xml index 07d38d8c8e..f14f01040e 100644 --- a/widget/testdata/select/layout_multiple.xml +++ b/widget/testdata/select/layout_multiple.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/layout_multiple_expanded.xml b/widget/testdata/select/layout_multiple_expanded.xml index e4a84488d3..4f3e260879 100644 --- a/widget/testdata/select/layout_multiple_expanded.xml +++ b/widget/testdata/select/layout_multiple_expanded.xml @@ -1,14 +1,14 @@ - - - - - - (Select one) + + + + + + (Select one) - + @@ -16,26 +16,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - Bar + + Bar diff --git a/widget/testdata/select/layout_multiple_expanded_placeholder.xml b/widget/testdata/select/layout_multiple_expanded_placeholder.xml index 47fd58a485..92e77e09d6 100644 --- a/widget/testdata/select/layout_multiple_expanded_placeholder.xml +++ b/widget/testdata/select/layout_multiple_expanded_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - (Pick 1) + + + + + + (Pick 1) - + @@ -16,26 +16,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - Bar + + Bar diff --git a/widget/testdata/select/layout_multiple_expanded_selected.xml b/widget/testdata/select/layout_multiple_expanded_selected.xml index 885f7c76df..6cc772dcd6 100644 --- a/widget/testdata/select/layout_multiple_expanded_selected.xml +++ b/widget/testdata/select/layout_multiple_expanded_selected.xml @@ -1,14 +1,14 @@ - - - - - - Foo + + + + + + Foo - + @@ -16,26 +16,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - Bar + + Bar diff --git a/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml b/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml index c055a32b32..387df9678e 100644 --- a/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml +++ b/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - Foo + + + + + + Foo - + @@ -16,26 +16,26 @@ - - + + - - - - - - - + + + + + + + - - - - - - Foo + + + + + + Foo - - Bar + + Bar diff --git a/widget/testdata/select/layout_multiple_placeholder.xml b/widget/testdata/select/layout_multiple_placeholder.xml index b977692cc2..642ea2ffdc 100644 --- a/widget/testdata/select/layout_multiple_placeholder.xml +++ b/widget/testdata/select/layout_multiple_placeholder.xml @@ -1,14 +1,14 @@ - - - + + + - - (Pick 1) + + (Pick 1) - + diff --git a/widget/testdata/select/layout_multiple_selected.xml b/widget/testdata/select/layout_multiple_selected.xml index d24791dced..7f3ad699e4 100644 --- a/widget/testdata/select/layout_multiple_selected.xml +++ b/widget/testdata/select/layout_multiple_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Foo + + Foo - + diff --git a/widget/testdata/select/layout_multiple_selected_placeholder.xml b/widget/testdata/select/layout_multiple_selected_placeholder.xml index f5b63131dd..770853bc7a 100644 --- a/widget/testdata/select/layout_multiple_selected_placeholder.xml +++ b/widget/testdata/select/layout_multiple_selected_placeholder.xml @@ -1,14 +1,14 @@ - - - + + + - - Foo + + Foo - + diff --git a/widget/testdata/select/layout_single.xml b/widget/testdata/select/layout_single.xml index 07d38d8c8e..f14f01040e 100644 --- a/widget/testdata/select/layout_single.xml +++ b/widget/testdata/select/layout_single.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/layout_single_expanded.xml b/widget/testdata/select/layout_single_expanded.xml index 091bbd0412..52b9c7325a 100644 --- a/widget/testdata/select/layout_single_expanded.xml +++ b/widget/testdata/select/layout_single_expanded.xml @@ -1,14 +1,14 @@ - - - - - - (Select one) + + + + + + (Select one) - + @@ -16,23 +16,23 @@ - - + + - - - - - - - + + + + + + + - - - - - - Test + + + + + + Test diff --git a/widget/testdata/select/layout_single_expanded_placeholder.xml b/widget/testdata/select/layout_single_expanded_placeholder.xml index 5652d04658..fa984df216 100644 --- a/widget/testdata/select/layout_single_expanded_placeholder.xml +++ b/widget/testdata/select/layout_single_expanded_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - (Pick 1) + + + + + + (Pick 1) - + @@ -16,23 +16,23 @@ - - + + - - - - - - - + + + + + + + - - - - - - Test + + + + + + Test diff --git a/widget/testdata/select/layout_single_expanded_selected.xml b/widget/testdata/select/layout_single_expanded_selected.xml index c5f41af41c..5ca383eb90 100644 --- a/widget/testdata/select/layout_single_expanded_selected.xml +++ b/widget/testdata/select/layout_single_expanded_selected.xml @@ -1,14 +1,14 @@ - - - - - - Test + + + + + + Test - + @@ -16,23 +16,23 @@ - - + + - - - - - - - + + + + + + + - - - - - - Test + + + + + + Test diff --git a/widget/testdata/select/layout_single_expanded_selected_placeholder.xml b/widget/testdata/select/layout_single_expanded_selected_placeholder.xml index 6d29011cf9..b7a5a040bb 100644 --- a/widget/testdata/select/layout_single_expanded_selected_placeholder.xml +++ b/widget/testdata/select/layout_single_expanded_selected_placeholder.xml @@ -1,14 +1,14 @@ - - - - - - Test + + + + + + Test - + @@ -16,23 +16,23 @@ - - + + - - - - - - - + + + + + + + - - - - - - Test + + + + + + Test diff --git a/widget/testdata/select/layout_single_placeholder.xml b/widget/testdata/select/layout_single_placeholder.xml index b977692cc2..642ea2ffdc 100644 --- a/widget/testdata/select/layout_single_placeholder.xml +++ b/widget/testdata/select/layout_single_placeholder.xml @@ -1,14 +1,14 @@ - - - + + + - - (Pick 1) + + (Pick 1) - + diff --git a/widget/testdata/select/layout_single_selected.xml b/widget/testdata/select/layout_single_selected.xml index ffb80030f0..357dc5e1a2 100644 --- a/widget/testdata/select/layout_single_selected.xml +++ b/widget/testdata/select/layout_single_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - Test + + Test - + diff --git a/widget/testdata/select/layout_single_selected_placeholder.xml b/widget/testdata/select/layout_single_selected_placeholder.xml index 6da2d82a22..75f66c79ea 100644 --- a/widget/testdata/select/layout_single_selected_placeholder.xml +++ b/widget/testdata/select/layout_single_selected_placeholder.xml @@ -1,14 +1,14 @@ - - - + + + - - Test + + Test - + diff --git a/widget/testdata/select/move_initial.xml b/widget/testdata/select/move_initial.xml index 752a64d0aa..ac259c00f5 100644 --- a/widget/testdata/select/move_initial.xml +++ b/widget/testdata/select/move_initial.xml @@ -1,13 +1,13 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/move_moved.xml b/widget/testdata/select/move_moved.xml index 9305136e7f..771c70a12f 100644 --- a/widget/testdata/select/move_moved.xml +++ b/widget/testdata/select/move_moved.xml @@ -1,39 +1,39 @@ - - - - - - (Select one) + + + + + + (Select one) - + - - + + - - - - - - - + + + + + + + - - - - - - 1 + + + + + + 1 - - 2 + + 2 diff --git a/widget/testdata/select/move_tapped.xml b/widget/testdata/select/move_tapped.xml index aa0bf0c5cc..447150d95d 100644 --- a/widget/testdata/select/move_tapped.xml +++ b/widget/testdata/select/move_tapped.xml @@ -1,39 +1,39 @@ - - - - - - (Select one) + + + + + + (Select one) - + - - + + - - - - - - - + + + + + + + - - - - - - 1 + + + + + + 1 - - 2 + + 2 diff --git a/widget/testdata/select/set_selected_2nd_selected.xml b/widget/testdata/select/set_selected_2nd_selected.xml index 1f930c6ff1..d9612d1f98 100644 --- a/widget/testdata/select/set_selected_2nd_selected.xml +++ b/widget/testdata/select/set_selected_2nd_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - 2 + + 2 - + diff --git a/widget/testdata/select/set_selected_none_selected.xml b/widget/testdata/select/set_selected_none_selected.xml index 62c78ee170..3470f4059c 100644 --- a/widget/testdata/select/set_selected_none_selected.xml +++ b/widget/testdata/select/set_selected_none_selected.xml @@ -1,14 +1,14 @@ - - - + + + - - (Select one) + + (Select one) - + diff --git a/widget/testdata/select/tap_animation.png b/widget/testdata/select/tap_animation.png index 4bf02b4644..5ff0d1013c 100644 Binary files a/widget/testdata/select/tap_animation.png and b/widget/testdata/select/tap_animation.png differ diff --git a/widget/testdata/select/tapped.xml b/widget/testdata/select/tapped.xml index a7a57fde60..5ef2e35fa5 100644 --- a/widget/testdata/select/tapped.xml +++ b/widget/testdata/select/tapped.xml @@ -1,39 +1,39 @@ - - - - - - (Select one) + + + + + + (Select one) - + - - + + - - - - - - - + + + + + + + - - - - - - 1 + + + + + + 1 - - 2 + + 2 diff --git a/widget/testdata/select/tapped_constrained.xml b/widget/testdata/select/tapped_constrained.xml index 07be8735b7..2db0e78240 100644 --- a/widget/testdata/select/tapped_constrained.xml +++ b/widget/testdata/select/tapped_constrained.xml @@ -1,39 +1,39 @@ - - - - - - (Select one) + + + + + + (Select one) - + - - + + - - - - - - - + + + + + + + - - - - - - 1 + + + + + + 1 - - 2 + + 2 diff --git a/widget/testdata/select/theme_changed.png b/widget/testdata/select/theme_changed.png index 78e75d1f59..e825e271bb 100644 Binary files a/widget/testdata/select/theme_changed.png and b/widget/testdata/select/theme_changed.png differ diff --git a/widget/testdata/select/theme_initial.png b/widget/testdata/select/theme_initial.png index 50672f917a..af7bac391a 100644 Binary files a/widget/testdata/select/theme_initial.png and b/widget/testdata/select/theme_initial.png differ diff --git a/widget/testdata/select_entry/disableable_disabled.xml b/widget/testdata/select_entry/disableable_disabled.xml index 983c91d87d..9d77a186f7 100644 --- a/widget/testdata/select_entry/disableable_disabled.xml +++ b/widget/testdata/select_entry/disableable_disabled.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/select_entry/disableable_enabled.xml b/widget/testdata/select_entry/disableable_enabled.xml index 9ee2b4d3d7..df47a9292e 100644 --- a/widget/testdata/select_entry/disableable_enabled.xml +++ b/widget/testdata/select_entry/disableable_enabled.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/select_entry/disableable_enabled_opened.xml b/widget/testdata/select_entry/disableable_enabled_opened.xml index 9ba2088bdd..6c2011555c 100644 --- a/widget/testdata/select_entry/disableable_enabled_opened.xml +++ b/widget/testdata/select_entry/disableable_enabled_opened.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + @@ -22,29 +22,29 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C diff --git a/widget/testdata/select_entry/disableable_enabled_tapped.xml b/widget/testdata/select_entry/disableable_enabled_tapped.xml index 00ad51f990..bf03fb204a 100644 --- a/widget/testdata/select_entry/disableable_enabled_tapped.xml +++ b/widget/testdata/select_entry/disableable_enabled_tapped.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/select_entry/disableable_enabled_tapped_selected.xml b/widget/testdata/select_entry/disableable_enabled_tapped_selected.xml index 00ad51f990..bf03fb204a 100644 --- a/widget/testdata/select_entry/disableable_enabled_tapped_selected.xml +++ b/widget/testdata/select_entry/disableable_enabled_tapped_selected.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/select_entry/dropdown_B_opened.xml b/widget/testdata/select_entry/dropdown_B_opened.xml index fd8a6d0b42..d7d851710f 100644 --- a/widget/testdata/select_entry/dropdown_B_opened.xml +++ b/widget/testdata/select_entry/dropdown_B_opened.xml @@ -1,12 +1,12 @@ - - - - - - - B + + + + + + + B @@ -19,29 +19,29 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C diff --git a/widget/testdata/select_entry/dropdown_empty_opened.xml b/widget/testdata/select_entry/dropdown_empty_opened.xml index 9ba2088bdd..6c2011555c 100644 --- a/widget/testdata/select_entry/dropdown_empty_opened.xml +++ b/widget/testdata/select_entry/dropdown_empty_opened.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + @@ -22,29 +22,29 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C diff --git a/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml b/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml index 2f42eee6ac..ed2d511943 100644 --- a/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml +++ b/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + @@ -22,29 +22,29 @@ - - + + - - - - - + + + + + - - - - - - A + + + + + + A - - B + + B - - C + + C diff --git a/widget/testdata/select_entry/dropdown_empty_setopts.xml b/widget/testdata/select_entry/dropdown_empty_setopts.xml index 29cde79135..d22a699b2d 100644 --- a/widget/testdata/select_entry/dropdown_empty_setopts.xml +++ b/widget/testdata/select_entry/dropdown_empty_setopts.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + @@ -22,29 +22,29 @@ - - + + - - - - - + + + + + - - - - - - 1 + + + + + + 1 - - 2 + + 2 - - 3 + + 3 diff --git a/widget/testdata/select_entry/dropdown_initial.xml b/widget/testdata/select_entry/dropdown_initial.xml index 9ee2b4d3d7..df47a9292e 100644 --- a/widget/testdata/select_entry/dropdown_initial.xml +++ b/widget/testdata/select_entry/dropdown_initial.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + - - + + diff --git a/widget/testdata/select_entry/dropdown_tapped_B.xml b/widget/testdata/select_entry/dropdown_tapped_B.xml index f3b8404003..d68168e441 100644 --- a/widget/testdata/select_entry/dropdown_tapped_B.xml +++ b/widget/testdata/select_entry/dropdown_tapped_B.xml @@ -1,12 +1,12 @@ - - - - - - - B + + + + + + + B diff --git a/widget/testdata/select_entry/dropdown_tapped_C.xml b/widget/testdata/select_entry/dropdown_tapped_C.xml index 49901b2e3b..40e6ec5a1a 100644 --- a/widget/testdata/select_entry/dropdown_tapped_C.xml +++ b/widget/testdata/select_entry/dropdown_tapped_C.xml @@ -1,12 +1,12 @@ - - - - - - - C + + + + + + + C diff --git a/widget/testdata/simple_renderer.png b/widget/testdata/simple_renderer.png index a096250902..754ed131c2 100644 Binary files a/widget/testdata/simple_renderer.png and b/widget/testdata/simple_renderer.png differ diff --git a/widget/testdata/table/col_size.png b/widget/testdata/table/col_size.png index 518124eb00..b823c1a97b 100644 Binary files a/widget/testdata/table/col_size.png and b/widget/testdata/table/col_size.png differ diff --git a/widget/testdata/table/desktop/hovered.xml b/widget/testdata/table/desktop/hovered.xml index 95e9bf831a..04267b1e21 100644 --- a/widget/testdata/table/desktop/hovered.xml +++ b/widget/testdata/table/desktop/hovered.xml @@ -2,24 +2,24 @@ - - - Cell 0, 0 + + + Cell 0, 0 - - Cell 0, 1 + + Cell 0, 1 - - Cell 1, 0 + + Cell 1, 0 - - Cell 1, 1 + + Cell 1, 1 - - Cell 2, 0 + + Cell 2, 0 - - Cell 2, 1 + + Cell 2, 1 @@ -31,15 +31,15 @@ - - - + + + - + - + diff --git a/widget/testdata/table/desktop/hovered_out.xml b/widget/testdata/table/desktop/hovered_out.xml index 345bd8e60b..32e93946e1 100644 --- a/widget/testdata/table/desktop/hovered_out.xml +++ b/widget/testdata/table/desktop/hovered_out.xml @@ -2,33 +2,33 @@ - - - Cell 0, 0 + + + Cell 0, 0 - - Cell 0, 1 + + Cell 0, 1 - - Cell 1, 0 + + Cell 1, 0 - - Cell 1, 1 + + Cell 1, 1 - - + + - + - + diff --git a/widget/testdata/table/selected.xml b/widget/testdata/table/selected.xml index 027d3d4d60..993330faf2 100644 --- a/widget/testdata/table/selected.xml +++ b/widget/testdata/table/selected.xml @@ -2,41 +2,41 @@ - - - Cell 0, 0 + + + Cell 0, 0 - - Cell 0, 1 + + Cell 0, 1 - - Cell 1, 0 + + Cell 1, 0 - - Cell 1, 1 + + Cell 1, 1 - - Cell 2, 0 + + Cell 2, 0 - - Cell 2, 1 + + Cell 2, 1 - - Cell 3, 0 + + Cell 3, 0 - - Cell 3, 1 + + Cell 3, 1 - - Cell 4, 0 + + Cell 4, 0 - - Cell 4, 1 + + Cell 4, 1 - - + + @@ -51,21 +51,21 @@ - - - + + + - + - + - + - + diff --git a/widget/testdata/table/selected_scrolled.xml b/widget/testdata/table/selected_scrolled.xml index f6d4e3f350..4f99049cd5 100644 --- a/widget/testdata/table/selected_scrolled.xml +++ b/widget/testdata/table/selected_scrolled.xml @@ -2,41 +2,41 @@ - - - Cell 0, 2 + + + Cell 0, 2 - - Cell 0, 3 + + Cell 0, 3 - - Cell 1, 2 + + Cell 1, 2 - - Cell 1, 3 + + Cell 1, 3 - - Cell 2, 2 + + Cell 2, 2 - - Cell 2, 3 + + Cell 2, 3 - - Cell 3, 2 + + Cell 3, 2 - - Cell 3, 3 + + Cell 3, 3 - - Cell 4, 2 + + Cell 4, 2 - - Cell 4, 3 + + Cell 4, 3 - - + + @@ -54,18 +54,18 @@ - - + + - + - + - + diff --git a/widget/testdata/table/theme_changed.png b/widget/testdata/table/theme_changed.png index db490fca53..177a4548a1 100644 Binary files a/widget/testdata/table/theme_changed.png and b/widget/testdata/table/theme_changed.png differ diff --git a/widget/testdata/table/theme_initial.png b/widget/testdata/table/theme_initial.png index f0b4a1d101..7f39298ba6 100644 Binary files a/widget/testdata/table/theme_initial.png and b/widget/testdata/table/theme_initial.png differ diff --git a/widget/testdata/tree/layout_multiple.xml b/widget/testdata/tree/layout_multiple.xml index d21ff12dc7..2ba05280c6 100644 --- a/widget/testdata/tree/layout_multiple.xml +++ b/widget/testdata/tree/layout_multiple.xml @@ -3,31 +3,31 @@ - - - A + + + A - - + + - + - - - B + + + B - - + + - + - - - 44444444444444444444 + + + 44444444444444444444 diff --git a/widget/testdata/tree/layout_multiple_branch.xml b/widget/testdata/tree/layout_multiple_branch.xml index 962324909a..a603a6236e 100644 --- a/widget/testdata/tree/layout_multiple_branch.xml +++ b/widget/testdata/tree/layout_multiple_branch.xml @@ -3,23 +3,23 @@ - - - A + + + A - - + + - + - - - B + + + B - - + + diff --git a/widget/testdata/tree/layout_multiple_branch_opened.xml b/widget/testdata/tree/layout_multiple_branch_opened.xml index 76664279ac..61cc41c744 100644 --- a/widget/testdata/tree/layout_multiple_branch_opened.xml +++ b/widget/testdata/tree/layout_multiple_branch_opened.xml @@ -2,65 +2,65 @@ - - - - A + + + + A - - + + - - + + - - - 11111 + + + 11111 - - + + - - - B + + + B - - + + - - + + - - - 2222222222 + + + 2222222222 - - + + - - - C + + + C - - + + - - + + - - - 333333333333333 + + + 333333333333333 - - + + diff --git a/widget/testdata/tree/layout_multiple_branch_opened_leaf_selected.xml b/widget/testdata/tree/layout_multiple_branch_opened_leaf_selected.xml index 6d0f60e397..c4fde138e8 100644 --- a/widget/testdata/tree/layout_multiple_branch_opened_leaf_selected.xml +++ b/widget/testdata/tree/layout_multiple_branch_opened_leaf_selected.xml @@ -2,66 +2,66 @@ - - - - A + + + + A - - + + - - + + - - - 11111 + + + 11111 - - + + - - - B + + + B - - + + - - + + - - - - 2222222222 + + + + 2222222222 - - + + - - - C + + + C - - + + - - + + - - - 333333333333333 + + + 333333333333333 - - + + diff --git a/widget/testdata/tree/layout_multiple_branch_opened_selected.xml b/widget/testdata/tree/layout_multiple_branch_opened_selected.xml index a866962def..4a86ac9313 100644 --- a/widget/testdata/tree/layout_multiple_branch_opened_selected.xml +++ b/widget/testdata/tree/layout_multiple_branch_opened_selected.xml @@ -2,66 +2,66 @@ - - - - A + + + + A - - + + - - + + - - - 11111 + + + 11111 - - + + - - - - B + + + + B - - + + - - + + - - - 2222222222 + + + 2222222222 - - + + - - - C + + + C - - + + - - + + - - - 333333333333333 + + + 333333333333333 - - + + diff --git a/widget/testdata/tree/layout_multiple_branch_selected.xml b/widget/testdata/tree/layout_multiple_branch_selected.xml index ef017dbb8e..cc727d27e1 100644 --- a/widget/testdata/tree/layout_multiple_branch_selected.xml +++ b/widget/testdata/tree/layout_multiple_branch_selected.xml @@ -3,24 +3,24 @@ - - - A + + + A - - + + - + - - - - B + + + + B - - + + diff --git a/widget/testdata/tree/layout_multiple_leaf.xml b/widget/testdata/tree/layout_multiple_leaf.xml index 209bbf9659..a00186b2b8 100644 --- a/widget/testdata/tree/layout_multiple_leaf.xml +++ b/widget/testdata/tree/layout_multiple_leaf.xml @@ -3,33 +3,33 @@ - - - 11111 + + + 11111 - + - - - 2222222222 + + + 2222222222 - + - - - 333333333333333 + + + 333333333333333 - + - - - 44444444444444444444 + + + 44444444444444444444 diff --git a/widget/testdata/tree/layout_multiple_leaf_selected.xml b/widget/testdata/tree/layout_multiple_leaf_selected.xml index 5f852939be..5c8bb33fd5 100644 --- a/widget/testdata/tree/layout_multiple_leaf_selected.xml +++ b/widget/testdata/tree/layout_multiple_leaf_selected.xml @@ -3,34 +3,34 @@ - - - 11111 + + + 11111 - + - - - - 2222222222 + + + + 2222222222 - + - - - 333333333333333 + + + 333333333333333 - + - - - 44444444444444444444 + + + 44444444444444444444 diff --git a/widget/testdata/tree/layout_multiple_selected.xml b/widget/testdata/tree/layout_multiple_selected.xml index 9f98b4402d..58de90f453 100644 --- a/widget/testdata/tree/layout_multiple_selected.xml +++ b/widget/testdata/tree/layout_multiple_selected.xml @@ -3,32 +3,32 @@ - - - A + + + A - - + + - + - - - B + + + B - - + + - + - - - - 44444444444444444444 + + + + 44444444444444444444 diff --git a/widget/testdata/tree/layout_single_branch.xml b/widget/testdata/tree/layout_single_branch.xml index 6e2ed17e90..902e4d4d0a 100644 --- a/widget/testdata/tree/layout_single_branch.xml +++ b/widget/testdata/tree/layout_single_branch.xml @@ -3,12 +3,12 @@ - - - A + + + A - - + + diff --git a/widget/testdata/tree/layout_single_branch_opened.xml b/widget/testdata/tree/layout_single_branch_opened.xml index ec405b680c..14cf7c1cae 100644 --- a/widget/testdata/tree/layout_single_branch_opened.xml +++ b/widget/testdata/tree/layout_single_branch_opened.xml @@ -3,20 +3,20 @@ - - - A + + + A - - + + - + - - - 11111 + + + 11111 diff --git a/widget/testdata/tree/layout_single_branch_opened_leaf_selected.xml b/widget/testdata/tree/layout_single_branch_opened_leaf_selected.xml index 2196488280..484fb5fb5e 100644 --- a/widget/testdata/tree/layout_single_branch_opened_leaf_selected.xml +++ b/widget/testdata/tree/layout_single_branch_opened_leaf_selected.xml @@ -3,21 +3,21 @@ - - - A + + + A - - + + - + - - - - 11111 + + + + 11111 diff --git a/widget/testdata/tree/layout_single_branch_opened_selected.xml b/widget/testdata/tree/layout_single_branch_opened_selected.xml index 662d27b2a4..1e182bc09a 100644 --- a/widget/testdata/tree/layout_single_branch_opened_selected.xml +++ b/widget/testdata/tree/layout_single_branch_opened_selected.xml @@ -3,21 +3,21 @@ - - - - A + + + + A - - + + - + - - - 11111 + + + 11111 diff --git a/widget/testdata/tree/layout_single_branch_selected.xml b/widget/testdata/tree/layout_single_branch_selected.xml index 0169f161f6..e037eda4fd 100644 --- a/widget/testdata/tree/layout_single_branch_selected.xml +++ b/widget/testdata/tree/layout_single_branch_selected.xml @@ -3,13 +3,13 @@ - - - - A + + + + A - - + + diff --git a/widget/testdata/tree/layout_single_leaf.xml b/widget/testdata/tree/layout_single_leaf.xml index 8ecedc6153..c9c0ef75da 100644 --- a/widget/testdata/tree/layout_single_leaf.xml +++ b/widget/testdata/tree/layout_single_leaf.xml @@ -3,9 +3,9 @@ - - - 11111 + + + 11111 diff --git a/widget/testdata/tree/layout_single_leaf_selected.xml b/widget/testdata/tree/layout_single_leaf_selected.xml index 07d4d03e25..4e685fab5e 100644 --- a/widget/testdata/tree/layout_single_leaf_selected.xml +++ b/widget/testdata/tree/layout_single_leaf_selected.xml @@ -3,10 +3,10 @@ - - - - 11111 + + + + 11111 diff --git a/widget/testdata/tree/move_initial.xml b/widget/testdata/tree/move_initial.xml index 19273b1458..0ac1ef5cb9 100644 --- a/widget/testdata/tree/move_initial.xml +++ b/widget/testdata/tree/move_initial.xml @@ -3,20 +3,20 @@ - - - foo + + + foo - - + + - + - - - foobar + + + foobar diff --git a/widget/testdata/tree/move_moved.xml b/widget/testdata/tree/move_moved.xml index 71599a4ed4..8b8634e2f6 100644 --- a/widget/testdata/tree/move_moved.xml +++ b/widget/testdata/tree/move_moved.xml @@ -3,20 +3,20 @@ - - - foo + + + foo - - + + - + - - - foobar + + + foobar diff --git a/widget/testdata/tree/refresh_initial.png b/widget/testdata/tree/refresh_initial.png index 517be18d6f..87af3052f4 100644 Binary files a/widget/testdata/tree/refresh_initial.png and b/widget/testdata/tree/refresh_initial.png differ diff --git a/widget/textgrid_test.go b/widget/textgrid_test.go index 63aa74839a..9b1f48757f 100644 --- a/widget/textgrid_test.go +++ b/widget/textgrid_test.go @@ -27,7 +27,7 @@ func TestTextGrid_CreateRendererRows(t *testing.T) { rend := test.WidgetRenderer(grid).(*textGridRenderer) rend.Refresh() - assert.Equal(t, 10, len(rend.objects)) + assert.Equal(t, 12, len(rend.objects)) } func TestTextGrid_Row(t *testing.T) {