Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete rounding by adding selection #4103

Merged
merged 5 commits into from
Aug 1, 2023
Merged

Complete rounding by adding selection #4103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0191ba0
Add a selection radius to all collection widgets
andydotxyz Jul 28, 2023
ee207c1
Also do what we can for menus... no shadow rounding though
andydotxyz Jul 28, 2023
2099b9b
Split out theme code to more files
andydotxyz Jul 28, 2023
5b799c8
Merge branch 'develop' into fix/3981
andydotxyz Jul 31, 2023
e374b89
Move to the selection radius for the two items that were not really i…
andydotxyz Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Also do what we can for menus... no shadow rounding though
  • Loading branch information
@andydotxyz
andydotxyz committed Jul 28, 2023
commit ee207c102a97cadd275ac4597fb831470b119655
2 changes: 2 additions & 0 deletions internal/driver/glfw/menu_bar_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func (i *menuBarItem) Child() *publicWidget.Menu {
// Implements: fyne.Widget
func (i *menuBarItem) CreateRenderer() fyne.WidgetRenderer {
background := canvas.NewRectangle(theme.HoverColor())
background.CornerRadius = theme.SelectionRadiusSize()
background.Hide()
text := canvas.NewText(i.Menu.Label, theme.ForegroundColor())
objects := []fyne.CanvasObject{background, text}
Expand Down Expand Up @@ -160,6 +161,7 @@ func (r *menuBarItemRenderer) MinSize() fyne.Size {
}

func (r *menuBarItemRenderer) Refresh() {
r.background.CornerRadius = theme.SelectionRadiusSize()
if r.i.active && r.i.Parent.active {
r.background.FillColor = theme.FocusColor()
r.background.Show()
Expand Down
Binary file modified internal/driver/glfw/testdata/menu_bar_active_edit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_active_file.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_active_help.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_content_not_hoverable_with_active_menu.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_hovered_file_new.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_hovered_file_open.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_hovered_file_recent.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_hovered_file_recent_older_old1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified internal/driver/glfw/testdata/menu_bar_inactive_file.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -52,7 +52,7 @@
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="44x19">Recent</text>
<image pos="60,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down Expand Up @@ -81,7 +81,7 @@
<text pos="8,8" size="56x19">File 2</text>
</widget>
<widget pos="0,78" size="72x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="72x35"/>
<rectangle fillColor="focus" radius="4" size="72x35"/>
<text pos="8,8" size="36x19">Older</text>
<image pos="52,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_close_submenu_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -52,7 +52,7 @@
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="44x19">Recent</text>
<image pos="60,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
6 changes: 3 additions & 3 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -52,7 +52,7 @@
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="44x19">Recent</text>
<image pos="60,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand All @@ -75,7 +75,7 @@
<rectangle fillColor="menuBackground" size="72x113"/>
<container size="72x113">
<widget size="72x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="72x35"/>
<rectangle fillColor="focus" radius="4" size="72x35"/>
<text pos="8,8" size="56x19">File 1</text>
</widget>
<widget pos="0,39" size="72x35" type="*widget.menuItem">
Expand Down
8 changes: 4 additions & 4 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_open_submenu_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -52,7 +52,7 @@
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="44x19">Recent</text>
<image pos="60,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down Expand Up @@ -81,7 +81,7 @@
<text pos="8,8" size="56x19">File 2</text>
</widget>
<widget pos="0,78" size="72x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="72x35"/>
<rectangle fillColor="focus" radius="4" size="72x35"/>
<text pos="8,8" size="36x19">Older</text>
<image pos="52,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand All @@ -104,7 +104,7 @@
<rectangle fillColor="menuBackground" size="50x74"/>
<container size="50x74">
<widget size="50x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="50x35"/>
<rectangle fillColor="focus" radius="4" size="50x35"/>
<text pos="8,8" size="34x19">Old 1</text>
</widget>
<widget pos="0,39" size="50x35" type="*widget.menuItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<text pos="8,4" size="25x19">Edit</text>
</widget>
<widget pos="87,0" size="46x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="46x27"/>
<rectangle fillColor="focus" radius="4" size="46x27"/>
<text pos="8,4" size="30x19">Help</text>
</widget>
</container>
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="41x27"/>
<rectangle fillColor="focus" radius="4" size="41x27"/>
<text pos="8,4" size="25x19">Edit</text>
</widget>
<widget pos="87,0" size="46x27" type="*glfw.menuBarItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_left_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="41x27"/>
<rectangle fillColor="focus" radius="4" size="41x27"/>
<text pos="8,4" size="25x19">Edit</text>
</widget>
<widget pos="87,0" size="46x27" type="*glfw.menuBarItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<text pos="8,4" size="25x19">Edit</text>
</widget>
<widget pos="87,0" size="46x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="46x27"/>
<rectangle fillColor="focus" radius="4" size="46x27"/>
<text pos="8,4" size="30x19">Help</text>
</widget>
</container>
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_bar_items_right_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand All @@ -46,7 +46,7 @@
<rectangle fillColor="menuBackground" size="80x113"/>
<container size="80x113">
<widget size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="64x19">New</text>
</widget>
<widget pos="0,39" size="80x35" type="*widget.menuItem">
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -49,7 +49,7 @@
<text pos="8,8" size="64x19">New</text>
</widget>
<widget pos="0,39" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_down_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -52,7 +52,7 @@
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="44x19">Recent</text>
<image pos="60,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down Expand Up @@ -49,7 +49,7 @@
<text pos="8,8" size="64x19">New</text>
</widget>
<widget pos="0,39" size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="64x19">Open</text>
</widget>
<widget pos="0,78" size="80x35" type="*widget.menuItem">
Expand Down
4 changes: 2 additions & 2 deletions internal/driver/glfw/testdata/menu_bar_kbdctrl_traverse_menu_up_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand All @@ -46,7 +46,7 @@
<rectangle fillColor="menuBackground" size="80x113"/>
<container size="80x113">
<widget size="80x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="80x35"/>
<rectangle fillColor="focus" radius="4" size="80x35"/>
<text pos="8,8" size="64x19">New</text>
</widget>
<widget pos="0,39" size="80x35" type="*widget.menuItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_toggle_first_item_active.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<rectangle fillColor="background" size="300x27"/>
<container pos="8,0" size="284x27">
<widget size="38x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="38x27"/>
<rectangle fillColor="focus" radius="4" size="38x27"/>
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/menu_bar_toggle_second_item_active.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<text pos="8,4" size="22x19">File</text>
</widget>
<widget pos="42,0" size="41x27" type="*glfw.menuBarItem">
<rectangle fillColor="focus" size="41x27"/>
<rectangle fillColor="focus" radius="4" size="41x27"/>
<text pos="8,4" size="25x19">Edit</text>
</widget>
</container>
Expand Down
2 changes: 1 addition & 1 deletion internal/driver/glfw/testdata/windows_hover_object.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</widget>
</widget>
<widget pos="0,39" size="192x35" type="*widget.listItem">
<rectangle fillColor="hover" size="192x35"/>
<rectangle fillColor="hover" radius="3" size="192x35"/>
<widget size="192x35" type="*widget.Entry">
<rectangle fillColor="inputBackground" pos="1,1" radius="5" size="190x33"/>
<rectangle radius="5" size="190x33" strokeColor="inputBorder" strokeWidth="1"/>
Expand Down
2 changes: 2 additions & 0 deletions widget/menu_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func (i *menuItem) Child() *Menu {
// Implements: fyne.Widget
func (i *menuItem) CreateRenderer() fyne.WidgetRenderer {
background := canvas.NewRectangle(theme.HoverColor())
background.CornerRadius = theme.SelectionRadiusSize()
background.Hide()
text := canvas.NewText(i.Item.Label, theme.ForegroundColor())
text.Alignment = i.alignment
Expand Down Expand Up @@ -291,6 +292,7 @@ func (r *menuItemRenderer) MinSize() fyne.Size {
}

func (r *menuItemRenderer) Refresh() {
r.background.CornerRadius = theme.SelectionRadiusSize()
if fyne.CurrentDevice().IsMobile() {
r.background.Hide()
} else if r.i.isActive() {
Expand Down
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_background_reset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<rectangle fillColor="disabled" size="66x1"/>
</widget>
<widget pos="0,44" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="50x19">B (long)</text>
</widget>
<widget pos="0,83" size="66x35" type="*widget.menuItem">
Expand Down
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_no_space_on_both_sides.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<text pos="8,8" size="50x19">B (long)</text>
</widget>
<widget pos="0,83" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">C</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_no_space_on_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<text pos="8,8" size="50x19">B (long)</text>
</widget>
<widget pos="0,83" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">C</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_normal_with_submenus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<text pos="8,8" size="50x19">B (long)</text>
</widget>
<widget pos="0,83" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">C</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
Binary file modified widget/testdata/menu/desktop/layout_shortcuts_darwin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_shortcuts_darwin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<rectangle fillColor="disabled" size="66x1"/>
</widget>
<widget pos="0,127" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">D</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
Binary file modified widget/testdata/menu/desktop/layout_shortcuts_darwin_theme_changed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified widget/testdata/menu/desktop/layout_shortcuts_other.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/layout_shortcuts_other.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<rectangle fillColor="disabled" size="66x1"/>
</widget>
<widget pos="0,127" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">D</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down
Binary file modified widget/testdata/menu/desktop/layout_shortcuts_other_theme_changed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions widget/testdata/menu/desktop/layout_window_too_short_for_submenu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<text pos="8,8" size="50x19">B (long)</text>
</widget>
<widget pos="0,83" size="66x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="66x35"/>
<rectangle fillColor="focus" radius="4" size="66x35"/>
<text pos="8,8" size="30x19">C</text>
<image pos="46,7" rsc="menuExpandIcon" size="iconInlineSize"/>
</widget>
Expand Down Expand Up @@ -76,7 +76,7 @@
<image pos="8,7" rsc="confirmIcon" size="iconInlineSize"/>
</widget>
<widget pos="0,78" size="199x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="199x35"/>
<rectangle fillColor="focus" radius="4" size="199x35"/>
<text pos="64,8" size="107x19">subitem C (long)</text>
<image pos="179,7" rsc="menuExpandIcon" size="iconInlineSize"/>
<image pos="36,7" rsc="menuIcon" size="iconInlineSize"/>
Expand Down
2 changes: 1 addition & 1 deletion widget/testdata/menu/desktop/traverse_first_active.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<rectangle fillColor="menuBackground" size="58x123"/>
<container size="58x123">
<widget size="58x35" type="*widget.menuItem">
<rectangle fillColor="focus" size="58x35"/>
<rectangle fillColor="focus" radius="4" size="58x35"/>
<text pos="8,8" size="42x19">Foo</text>
</widget>
<widget pos="0,39" size="58x1" type="*widget.Separator">
Expand Down
Loading