From 8f3d330df36e742be3a376ab02559b495473d654 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Thu, 22 Jul 2021 12:36:21 +0100 Subject: [PATCH] Add Alignment to Select Need to pass it all the way down to menu item. Do so internally for now, as we don't need to expose alignment of menu items publicly. Fixes #2329 --- .../doctabs/desktop/tapped_all_tabs.xml | 6 +++--- .../doctabs/mobile/tapped_all_tabs.xml | 6 +++--- .../menu_bar_kbdctrl_close_submenu_1.xml | 12 +++++------ .../menu_bar_kbdctrl_close_submenu_2.xml | 6 +++--- .../menu_bar_kbdctrl_open_submenu_1.xml | 12 +++++------ .../menu_bar_kbdctrl_open_submenu_2.xml | 12 +++++------ ...kbdctrl_traverse_menu_bar_items_left_2.xml | 2 +- ...kbdctrl_traverse_menu_bar_items_left_3.xml | 6 +++--- ...bdctrl_traverse_menu_bar_items_right_1.xml | 2 +- ...bdctrl_traverse_menu_bar_items_right_3.xml | 6 +++--- .../menu_bar_kbdctrl_traverse_menu_down_1.xml | 6 +++--- .../menu_bar_kbdctrl_traverse_menu_down_2.xml | 6 +++--- .../menu_bar_kbdctrl_traverse_menu_down_3.xml | 6 +++--- .../menu_bar_kbdctrl_traverse_menu_up_1.xml | 6 +++--- .../menu_bar_kbdctrl_traverse_menu_up_2.xml | 6 +++--- .../menu_bar_toggle_first_item_active.xml | 2 +- .../menu_bar_toggle_second_item_active.xml | 2 +- widget/menu.go | 8 ++++++++ widget/menu_item.go | 8 ++++++-- widget/popup_menu.go | 20 +++++++++++++++++++ widget/select.go | 20 ++++++++++++------- .../entry/focus_with_popup_initial.xml | 6 +++--- .../entry/tapped_secondary_full_menu.xml | 6 +++--- .../entry/tapped_secondary_password_menu.xml | 2 +- .../entry/tapped_secondary_read_menu.xml | 2 +- .../menu/desktop/layout_background_reset.xml | 4 ++-- .../desktop/layout_no_space_on_both_sides.xml | 12 +++++------ .../menu/desktop/layout_no_space_on_right.xml | 12 +++++------ .../testdata/menu/desktop/layout_normal.xml | 4 ++-- .../desktop/layout_normal_with_submenus.xml | 12 +++++------ .../menu/desktop/layout_theme_changed.xml | 4 ++-- .../menu/desktop/layout_window_too_short.xml | 4 ++-- .../layout_window_too_short_for_submenu.xml | 12 +++++------ .../testdata/menu/desktop/scroll_bottom.xml | 10 +++++----- .../testdata/menu/desktop/scroll_middle.xml | 10 +++++----- widget/testdata/menu/desktop/scroll_top.xml | 10 +++++----- .../menu/desktop/traverse_first_active.xml | 6 +++--- .../menu/desktop/traverse_initial.xml | 6 +++--- .../menu/desktop/traverse_second_active.xml | 6 +++--- .../desktop/traverse_submenu_first_active.xml | 6 +++--- .../traverse_submenu_second_active.xml | 6 +++--- .../menu/desktop/traverse_third_active.xml | 6 +++--- widget/testdata/menu/mobile/drag_bottom.xml | 10 +++++----- widget/testdata/menu/mobile/drag_middle.xml | 10 +++++----- widget/testdata/menu/mobile/drag_top.xml | 10 +++++----- .../menu/mobile/layout_background_reset.xml | 4 ++-- .../mobile/layout_no_space_on_both_sides.xml | 12 +++++------ .../menu/mobile/layout_no_space_on_right.xml | 12 +++++------ widget/testdata/menu/mobile/layout_normal.xml | 4 ++-- .../mobile/layout_normal_with_submenus.xml | 12 +++++------ .../menu/mobile/layout_theme_changed.xml | 4 ++-- .../menu/mobile/layout_window_too_short.xml | 4 ++-- .../layout_window_too_short_for_submenu.xml | 12 +++++------ .../testdata/popup_menu/canvas_too_small.xml | 4 ++-- .../desktop/kbd_ctrl_first_active.xml | 4 ++-- .../desktop/kbd_ctrl_first_sub_active.xml | 8 ++++---- .../desktop/kbd_ctrl_first_sub_sub_active.xml | 8 ++++---- .../desktop/kbd_ctrl_second_active.xml | 4 ++-- .../desktop/kbd_ctrl_second_sub_active.xml | 8 ++++---- .../kbd_ctrl_second_sub_sub_active.xml | 8 ++++---- .../popup_menu/desktop/kbd_ctrl_shown.xml | 4 ++-- widget/testdata/popup_menu/grown.xml | 4 ++-- .../select/kbdctrl_none_selected_popup.xml | 4 ++-- .../select/layout_multiple_expanded.xml | 4 ++-- .../layout_multiple_expanded_placeholder.xml | 4 ++-- .../layout_multiple_expanded_selected.xml | 4 ++-- ...multiple_expanded_selected_placeholder.xml | 4 ++-- .../select/layout_single_expanded.xml | 2 +- .../layout_single_expanded_placeholder.xml | 2 +- .../layout_single_expanded_selected.xml | 2 +- ...t_single_expanded_selected_placeholder.xml | 2 +- widget/testdata/select/move_moved.xml | 4 ++-- widget/testdata/select/move_tapped.xml | 4 ++-- widget/testdata/select/tapped.xml | 4 ++-- widget/testdata/select/tapped_constrained.xml | 4 ++-- .../disableable_enabled_opened.xml | 6 +++--- .../select_entry/dropdown_B_opened.xml | 6 +++--- .../select_entry/dropdown_empty_opened.xml | 6 +++--- .../dropdown_empty_opened_shrunk.xml | 6 +++--- .../select_entry/dropdown_empty_setopts.xml | 6 +++--- 80 files changed, 282 insertions(+), 244 deletions(-) diff --git a/container/testdata/doctabs/desktop/tapped_all_tabs.xml b/container/testdata/doctabs/desktop/tapped_all_tabs.xml index 4b43f9313e..23542c0c2a 100644 --- a/container/testdata/doctabs/desktop/tapped_all_tabs.xml +++ b/container/testdata/doctabs/desktop/tapped_all_tabs.xml @@ -56,13 +56,13 @@ - Test1 + Test1 - Test2 + Test2 - Test3 + Test3 Another diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml index c93d8874b2..4e67704deb 100644 --- a/container/testdata/doctabs/mobile/tapped_all_tabs.xml +++ b/container/testdata/doctabs/mobile/tapped_all_tabs.xml @@ -68,13 +68,13 @@ - Test1 + Test1 - Test2 + Test2 - Test3 + Test3 Another 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..c26ed88d84 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 @@ -46,14 +46,14 @@ - New + New - Open + Open - Recent + Recent @@ -75,14 +75,14 @@ - 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..66a2afb7c1 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 @@ -46,14 +46,14 @@ - 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..5bff5187be 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 @@ -46,14 +46,14 @@ - New + New - Open + Open - Recent + Recent @@ -76,13 +76,13 @@ - 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..ab72f1c215 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 @@ -46,14 +46,14 @@ - New + New - Open + Open - Recent + Recent @@ -75,14 +75,14 @@ - File 1 + File 1 - File 2 + File 2 - Older + Older 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..98d1120b7d 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 @@ -46,7 +46,7 @@ - Copy + Copy 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..b4f9a46349 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 @@ -46,13 +46,13 @@ - 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..98d1120b7d 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 @@ -46,7 +46,7 @@ - Copy + Copy Paste 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..b4f9a46349 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 @@ -46,13 +46,13 @@ - 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..1ef2332ee0 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 @@ -47,13 +47,13 @@ - 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..b3a1cca27f 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 @@ -46,14 +46,14 @@ - 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..66a2afb7c1 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 @@ -46,14 +46,14 @@ - 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..b3a1cca27f 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 @@ -46,14 +46,14 @@ - 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..1ef2332ee0 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 @@ -47,13 +47,13 @@ - New + New - Open + Open - Recent + Recent 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..46a69f6473 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 @@ -40,7 +40,7 @@ - New + New 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..97377e2eb7 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 @@ -40,7 +40,7 @@ - Copy + Copy Paste diff --git a/widget/menu.go b/widget/menu.go index 00c8e6176a..6f5e76dcaa 100644 --- a/widget/menu.go +++ b/widget/menu.go @@ -14,6 +14,7 @@ var _ fyne.Tappable = (*Menu)(nil) // Menu is a widget for displaying a fyne.Menu. type Menu struct { widget.Base + alignment fyne.TextAlign Items []fyne.CanvasObject OnDismiss func() activeItem *menuItem @@ -241,6 +242,13 @@ func (r *menuRenderer) MinSize() fyne.Size { func (r *menuRenderer) Refresh() { r.layoutActiveChild() r.ShadowingRenderer.RefreshShadow() + + for _, i := range r.m.Items { + if txt, ok := i.(*menuItem); ok { + txt.alignment = r.m.alignment + } + } + canvas.Refresh(r.m) } diff --git a/widget/menu_item.go b/widget/menu_item.go index 7f56d77d23..fb7dfc37bd 100644 --- a/widget/menu_item.go +++ b/widget/menu_item.go @@ -16,12 +16,14 @@ type menuItem struct { Item *fyne.MenuItem Parent *Menu - child *Menu + alignment fyne.TextAlign + child *Menu } // newMenuItem creates a new menuItem. func newMenuItem(item *fyne.MenuItem, parent *Menu) *menuItem { i := &menuItem{Item: item, Parent: parent} + i.alignment = parent.alignment i.ExtendBaseWidget(i) return i } @@ -43,6 +45,7 @@ func (i *menuItem) CreateRenderer() fyne.WidgetRenderer { background := canvas.NewRectangle(theme.HoverColor()) background.Hide() text := canvas.NewText(i.Item.Label, theme.ForegroundColor()) + text.Alignment = i.alignment objects := []fyne.CanvasObject{background, text} var icon *canvas.Image if i.Item.ChildMenu != nil { @@ -171,7 +174,7 @@ func (r *menuItemRenderer) Layout(size fyne.Size) { r.text.TextSize = theme.TextSize() r.text.Color = theme.ForegroundColor() - r.text.Resize(r.text.MinSize()) + r.text.Resize(size.Subtract(fyne.NewSize(theme.Padding()*4, theme.Padding()*2))) r.text.Move(fyne.NewPos(padding.Width/2, padding.Height/2)) if r.icon != nil { @@ -205,6 +208,7 @@ func (r *menuItemRenderer) Refresh() { r.background.Hide() } r.background.Refresh() + r.text.Alignment = r.i.alignment canvas.Refresh(r.i) } diff --git a/widget/popup_menu.go b/widget/popup_menu.go index 822530e29f..6ab0e6f295 100644 --- a/widget/popup_menu.go +++ b/widget/popup_menu.go @@ -67,6 +67,15 @@ func (p *PopUpMenu) Move(pos fyne.Position) { p.Base.Move(p.adjustedPosition(pos, p.Size())) } +// Refresh ensures the menu updates to reflect data changes. +// +// Implements: fyne.Widget +func (p *PopUpMenu) Refresh() { + p.updateItems() + + p.Menu.Refresh() +} + // Resize changes the size of the pop-up menu. // // Implements: fyne.Widget @@ -79,6 +88,8 @@ func (p *PopUpMenu) Resize(size fyne.Size) { // // Implements: fyne.Widget func (p *PopUpMenu) Show() { + p.updateItems() + p.overlay.Show() p.Menu.Show() p.canvas.Focus(p) @@ -132,3 +143,12 @@ func (p *PopUpMenu) adjustedPosition(pos fyne.Position, size fyne.Size) fyne.Pos } return fyne.NewPos(x, y) } + +func (p *PopUpMenu) updateItems() { + for _, item := range p.Menu.Items { + if mItem, ok := item.(*menuItem); ok { + mItem.alignment = p.alignment + mItem.Refresh() + } + } +} diff --git a/widget/select.go b/widget/select.go index 56d9509316..9d102adc25 100644 --- a/widget/select.go +++ b/widget/select.go @@ -15,6 +15,10 @@ const defaultPlaceHolder string = "(Select one)" type Select struct { DisableableWidget + // Alignment sets the text alignment of the select and its list of options. + // + // Since: 2.1 + Alignment fyne.TextAlign Selected string Options []string PlaceHolder string @@ -236,6 +240,7 @@ func (s *Select) showPopUp() { c := fyne.CurrentApp().Driver().CanvasForObject(s.super()) s.popUp = NewPopUpMenu(fyne.NewMenu("", items...), c) + s.popUp.alignment = s.Alignment s.popUp.ShowAtPosition(s.popUpPos()) s.popUp.Resize(fyne.NewSize(s.Size().Width, s.popUp.MinSize().Height)) } @@ -311,17 +316,12 @@ func (s *selectRenderer) Refresh() { s.background.FillColor, s.line.FillColor = s.bgLineColor() s.combo.propertyLock.RUnlock() - if s.combo.disabled { - s.label.Segments[0].(*TextSegment).Style.ColorName = theme.ColorNameDisabled - } else { - s.label.Segments[0].(*TextSegment).Style.ColorName = theme.ColorNameForeground - } - s.label.Refresh() - s.Layout(s.combo.Size()) if s.combo.popUp != nil { + s.combo.popUp.alignment = s.combo.Alignment s.combo.popUp.Move(s.combo.popUpPos()) s.combo.popUp.Resize(fyne.NewSize(s.combo.size.Width, s.combo.popUp.MinSize().Width)) + s.combo.popUp.Refresh() } s.background.Refresh() canvas.Refresh(s.combo.super()) @@ -354,6 +354,12 @@ func (s *selectRenderer) updateLabel() { s.combo.PlaceHolder = defaultPlaceHolder } + s.label.Segments[0].(*TextSegment).Style.Alignment = s.combo.Alignment + if s.combo.disabled { + s.label.Segments[0].(*TextSegment).Style.ColorName = theme.ColorNameDisabled + } else { + s.label.Segments[0].(*TextSegment).Style.ColorName = theme.ColorNameForeground + } if s.combo.Selected == "" { s.label.Segments[0].(*TextSegment).Text = s.combo.PlaceHolder } else { diff --git a/widget/testdata/entry/focus_with_popup_initial.xml b/widget/testdata/entry/focus_with_popup_initial.xml index 72ef150fae..16b8f3e46e 100644 --- a/widget/testdata/entry/focus_with_popup_initial.xml +++ b/widget/testdata/entry/focus_with_popup_initial.xml @@ -32,13 +32,13 @@ - Cut + Cut - Copy + Copy - Paste + Paste Select all diff --git a/widget/testdata/entry/tapped_secondary_full_menu.xml b/widget/testdata/entry/tapped_secondary_full_menu.xml index 064e381fa2..728716b188 100644 --- a/widget/testdata/entry/tapped_secondary_full_menu.xml +++ b/widget/testdata/entry/tapped_secondary_full_menu.xml @@ -32,13 +32,13 @@ - Cut + Cut - Copy + Copy - Paste + Paste Select all diff --git a/widget/testdata/entry/tapped_secondary_password_menu.xml b/widget/testdata/entry/tapped_secondary_password_menu.xml index d2486a1f02..ba84621d64 100644 --- a/widget/testdata/entry/tapped_secondary_password_menu.xml +++ b/widget/testdata/entry/tapped_secondary_password_menu.xml @@ -32,7 +32,7 @@ - Paste + Paste Select all diff --git a/widget/testdata/entry/tapped_secondary_read_menu.xml b/widget/testdata/entry/tapped_secondary_read_menu.xml index 7d83289035..e91c9f137d 100644 --- a/widget/testdata/entry/tapped_secondary_read_menu.xml +++ b/widget/testdata/entry/tapped_secondary_read_menu.xml @@ -31,7 +31,7 @@ - Copy + Copy Select all diff --git a/widget/testdata/menu/desktop/layout_background_reset.xml b/widget/testdata/menu/desktop/layout_background_reset.xml index 1ae27b378a..506a260928 100644 --- a/widget/testdata/menu/desktop/layout_background_reset.xml +++ b/widget/testdata/menu/desktop/layout_background_reset.xml @@ -20,7 +20,7 @@ - A + A @@ -30,7 +30,7 @@ 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..06afe8da82 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 @@ -20,7 +20,7 @@ - A + A @@ -30,7 +30,7 @@ - C + C @@ -52,14 +52,14 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -84,7 +84,7 @@ 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..436e8b39c0 100644 --- a/widget/testdata/menu/desktop/layout_no_space_on_right.xml +++ b/widget/testdata/menu/desktop/layout_no_space_on_right.xml @@ -20,7 +20,7 @@ - A + A @@ -30,7 +30,7 @@ - C + C @@ -52,14 +52,14 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -84,7 +84,7 @@ 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..f97ecf6613 100644 --- a/widget/testdata/menu/desktop/layout_normal.xml +++ b/widget/testdata/menu/desktop/layout_normal.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..f95b1de251 100644 --- a/widget/testdata/menu/desktop/layout_normal_with_submenus.xml +++ b/widget/testdata/menu/desktop/layout_normal_with_submenus.xml @@ -20,7 +20,7 @@ - A + A @@ -30,7 +30,7 @@ - C + C @@ -52,14 +52,14 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -84,7 +84,7 @@ 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..f97ecf6613 100644 --- a/widget/testdata/menu/desktop/layout_theme_changed.xml +++ b/widget/testdata/menu/desktop/layout_theme_changed.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..14462dda93 100644 --- a/widget/testdata/menu/desktop/layout_window_too_short.xml +++ b/widget/testdata/menu/desktop/layout_window_too_short.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..487146a1d9 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 @@ -20,7 +20,7 @@ - A + A @@ -30,7 +30,7 @@ - C + C @@ -52,14 +52,14 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -84,7 +84,7 @@ subsubitem A (long) - subsubitem B + subsubitem B diff --git a/widget/testdata/menu/desktop/scroll_bottom.xml b/widget/testdata/menu/desktop/scroll_bottom.xml index 289b3256a0..a361add184 100644 --- a/widget/testdata/menu/desktop/scroll_bottom.xml +++ b/widget/testdata/menu/desktop/scroll_bottom.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..302cc48340 100644 --- a/widget/testdata/menu/desktop/scroll_middle.xml +++ b/widget/testdata/menu/desktop/scroll_middle.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..327501181f 100644 --- a/widget/testdata/menu/desktop/scroll_top.xml +++ b/widget/testdata/menu/desktop/scroll_top.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..c906758baf 100644 --- a/widget/testdata/menu/desktop/traverse_first_active.xml +++ b/widget/testdata/menu/desktop/traverse_first_active.xml @@ -18,20 +18,20 @@ - 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..3f3478d7aa 100644 --- a/widget/testdata/menu/desktop/traverse_initial.xml +++ b/widget/testdata/menu/desktop/traverse_initial.xml @@ -17,20 +17,20 @@ - 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..d046d083d4 100644 --- a/widget/testdata/menu/desktop/traverse_second_active.xml +++ b/widget/testdata/menu/desktop/traverse_second_active.xml @@ -17,21 +17,21 @@ - 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..19bd4f9a7d 100644 --- a/widget/testdata/menu/desktop/traverse_submenu_first_active.xml +++ b/widget/testdata/menu/desktop/traverse_submenu_first_active.xml @@ -17,21 +17,21 @@ - Foo + Foo - Bar + Bar - Baz + Baz diff --git a/widget/testdata/menu/desktop/traverse_submenu_second_active.xml b/widget/testdata/menu/desktop/traverse_submenu_second_active.xml index cfe0c1c070..946a8afba2 100644 --- a/widget/testdata/menu/desktop/traverse_submenu_second_active.xml +++ b/widget/testdata/menu/desktop/traverse_submenu_second_active.xml @@ -17,21 +17,21 @@ - Foo + Foo - Bar + Bar - Baz + Baz diff --git a/widget/testdata/menu/desktop/traverse_third_active.xml b/widget/testdata/menu/desktop/traverse_third_active.xml index 51daccc009..62bcd46fc5 100644 --- a/widget/testdata/menu/desktop/traverse_third_active.xml +++ b/widget/testdata/menu/desktop/traverse_third_active.xml @@ -17,13 +17,13 @@ - Foo + Foo - Bar + Bar @@ -31,7 +31,7 @@ - Baz + Baz diff --git a/widget/testdata/menu/mobile/drag_bottom.xml b/widget/testdata/menu/mobile/drag_bottom.xml index 289b3256a0..a361add184 100644 --- a/widget/testdata/menu/mobile/drag_bottom.xml +++ b/widget/testdata/menu/mobile/drag_bottom.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..302cc48340 100644 --- a/widget/testdata/menu/mobile/drag_middle.xml +++ b/widget/testdata/menu/mobile/drag_middle.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..327501181f 100644 --- a/widget/testdata/menu/mobile/drag_top.xml +++ b/widget/testdata/menu/mobile/drag_top.xml @@ -20,22 +20,22 @@ - A + A - B + B - C + C 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..f97ecf6613 100644 --- a/widget/testdata/menu/mobile/layout_background_reset.xml +++ b/widget/testdata/menu/mobile/layout_background_reset.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..b21f8d3626 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 @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ B (long) - C + C @@ -51,13 +51,13 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -82,7 +82,7 @@ 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..de314792aa 100644 --- a/widget/testdata/menu/mobile/layout_no_space_on_right.xml +++ b/widget/testdata/menu/mobile/layout_no_space_on_right.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ B (long) - C + C @@ -51,13 +51,13 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -82,7 +82,7 @@ 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..f97ecf6613 100644 --- a/widget/testdata/menu/mobile/layout_normal.xml +++ b/widget/testdata/menu/mobile/layout_normal.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..deb114d333 100644 --- a/widget/testdata/menu/mobile/layout_normal_with_submenus.xml +++ b/widget/testdata/menu/mobile/layout_normal_with_submenus.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ B (long) - C + C @@ -51,13 +51,13 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -82,7 +82,7 @@ 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..f97ecf6613 100644 --- a/widget/testdata/menu/mobile/layout_theme_changed.xml +++ b/widget/testdata/menu/mobile/layout_theme_changed.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..14462dda93 100644 --- a/widget/testdata/menu/mobile/layout_window_too_short.xml +++ b/widget/testdata/menu/mobile/layout_window_too_short.xml @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ 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..2d8c0913dd 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 @@ -20,7 +20,7 @@ - A + A @@ -29,7 +29,7 @@ B (long) - C + C @@ -51,13 +51,13 @@ - subitem A + subitem A - subitem B + subitem B - subitem C (long) + subitem C (long) @@ -82,7 +82,7 @@ subsubitem A (long) - subsubitem B + subsubitem B diff --git a/widget/testdata/popup_menu/canvas_too_small.xml b/widget/testdata/popup_menu/canvas_too_small.xml index 03e89850fc..187241a38c 100644 --- a/widget/testdata/popup_menu/canvas_too_small.xml +++ b/widget/testdata/popup_menu/canvas_too_small.xml @@ -20,10 +20,10 @@ - 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..4195cf8b14 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_first_active.xml @@ -21,10 +21,10 @@ - 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..06e9965100 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 @@ -20,11 +20,11 @@ - Option A + Option A - Option B + Option B @@ -47,10 +47,10 @@ - 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..45dca401ae 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 @@ -20,11 +20,11 @@ - Option A + Option A - Option B + Option B @@ -46,11 +46,11 @@ - Sub Option A + Sub Option A - Sub Option B + 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..b24ec509ca 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_second_active.xml @@ -20,11 +20,11 @@ - 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..ed788f5c42 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 @@ -20,11 +20,11 @@ - Option A + Option A - Option B + Option B @@ -46,11 +46,11 @@ - 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..fe3ccc5495 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 @@ -20,11 +20,11 @@ - Option A + Option A - Option B + Option B @@ -46,11 +46,11 @@ - Sub Option A + Sub Option A - Sub Option B + 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..59fabbc2a0 100644 --- a/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml +++ b/widget/testdata/popup_menu/desktop/kbd_ctrl_shown.xml @@ -20,10 +20,10 @@ - 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..82dd03b926 100644 --- a/widget/testdata/popup_menu/grown.xml +++ b/widget/testdata/popup_menu/grown.xml @@ -20,10 +20,10 @@ - Option A + Option A - Option B + Option B diff --git a/widget/testdata/select/kbdctrl_none_selected_popup.xml b/widget/testdata/select/kbdctrl_none_selected_popup.xml index 6123ea6da1..e32fa4c96e 100644 --- a/widget/testdata/select/kbdctrl_none_selected_popup.xml +++ b/widget/testdata/select/kbdctrl_none_selected_popup.xml @@ -32,10 +32,10 @@ - Option A + Option A - Option B + Option B diff --git a/widget/testdata/select/layout_multiple_expanded.xml b/widget/testdata/select/layout_multiple_expanded.xml index e4a84488d3..bf1073baf0 100644 --- a/widget/testdata/select/layout_multiple_expanded.xml +++ b/widget/testdata/select/layout_multiple_expanded.xml @@ -32,10 +32,10 @@ - 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..839e8d3dd7 100644 --- a/widget/testdata/select/layout_multiple_expanded_placeholder.xml +++ b/widget/testdata/select/layout_multiple_expanded_placeholder.xml @@ -32,10 +32,10 @@ - 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..b7976a5af4 100644 --- a/widget/testdata/select/layout_multiple_expanded_selected.xml +++ b/widget/testdata/select/layout_multiple_expanded_selected.xml @@ -32,10 +32,10 @@ - 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..94255d6288 100644 --- a/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml +++ b/widget/testdata/select/layout_multiple_expanded_selected_placeholder.xml @@ -32,10 +32,10 @@ - Foo + Foo - Bar + Bar diff --git a/widget/testdata/select/layout_single_expanded.xml b/widget/testdata/select/layout_single_expanded.xml index 091bbd0412..a0827942aa 100644 --- a/widget/testdata/select/layout_single_expanded.xml +++ b/widget/testdata/select/layout_single_expanded.xml @@ -32,7 +32,7 @@ - Test + Test diff --git a/widget/testdata/select/layout_single_expanded_placeholder.xml b/widget/testdata/select/layout_single_expanded_placeholder.xml index 5652d04658..eb755c53c8 100644 --- a/widget/testdata/select/layout_single_expanded_placeholder.xml +++ b/widget/testdata/select/layout_single_expanded_placeholder.xml @@ -32,7 +32,7 @@ - Test + Test diff --git a/widget/testdata/select/layout_single_expanded_selected.xml b/widget/testdata/select/layout_single_expanded_selected.xml index c5f41af41c..66b2926c73 100644 --- a/widget/testdata/select/layout_single_expanded_selected.xml +++ b/widget/testdata/select/layout_single_expanded_selected.xml @@ -32,7 +32,7 @@ - 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..c85376a19a 100644 --- a/widget/testdata/select/layout_single_expanded_selected_placeholder.xml +++ b/widget/testdata/select/layout_single_expanded_selected_placeholder.xml @@ -32,7 +32,7 @@ - Test + Test diff --git a/widget/testdata/select/move_moved.xml b/widget/testdata/select/move_moved.xml index 9305136e7f..a1d0888b4b 100644 --- a/widget/testdata/select/move_moved.xml +++ b/widget/testdata/select/move_moved.xml @@ -30,10 +30,10 @@ - 1 + 1 - 2 + 2 diff --git a/widget/testdata/select/move_tapped.xml b/widget/testdata/select/move_tapped.xml index aa0bf0c5cc..fe7a658f50 100644 --- a/widget/testdata/select/move_tapped.xml +++ b/widget/testdata/select/move_tapped.xml @@ -30,10 +30,10 @@ - 1 + 1 - 2 + 2 diff --git a/widget/testdata/select/tapped.xml b/widget/testdata/select/tapped.xml index a7a57fde60..1d7775ffa6 100644 --- a/widget/testdata/select/tapped.xml +++ b/widget/testdata/select/tapped.xml @@ -30,10 +30,10 @@ - 1 + 1 - 2 + 2 diff --git a/widget/testdata/select/tapped_constrained.xml b/widget/testdata/select/tapped_constrained.xml index 07be8735b7..f4713278f9 100644 --- a/widget/testdata/select/tapped_constrained.xml +++ b/widget/testdata/select/tapped_constrained.xml @@ -30,10 +30,10 @@ - 1 + 1 - 2 + 2 diff --git a/widget/testdata/select_entry/disableable_enabled_opened.xml b/widget/testdata/select_entry/disableable_enabled_opened.xml index 9ba2088bdd..75268c2827 100644 --- a/widget/testdata/select_entry/disableable_enabled_opened.xml +++ b/widget/testdata/select_entry/disableable_enabled_opened.xml @@ -38,13 +38,13 @@ - A + A - B + B - C + C diff --git a/widget/testdata/select_entry/dropdown_B_opened.xml b/widget/testdata/select_entry/dropdown_B_opened.xml index fd8a6d0b42..7f48117254 100644 --- a/widget/testdata/select_entry/dropdown_B_opened.xml +++ b/widget/testdata/select_entry/dropdown_B_opened.xml @@ -35,13 +35,13 @@ - 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..75268c2827 100644 --- a/widget/testdata/select_entry/dropdown_empty_opened.xml +++ b/widget/testdata/select_entry/dropdown_empty_opened.xml @@ -38,13 +38,13 @@ - 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..597a03bec3 100644 --- a/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml +++ b/widget/testdata/select_entry/dropdown_empty_opened_shrunk.xml @@ -38,13 +38,13 @@ - 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..1d9c2f9c1d 100644 --- a/widget/testdata/select_entry/dropdown_empty_setopts.xml +++ b/widget/testdata/select_entry/dropdown_empty_setopts.xml @@ -38,13 +38,13 @@ - 1 + 1 - 2 + 2 - 3 + 3