Update menu mobile markup tests (fyne-io#1963)

andydotxyz · Feb 17, 2021 · d2e7244 · d2e7244
1 parent 25bc694
commit d2e7244
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 4 deletions.
diff --git a/widget/testdata/menu/mobile/drag_bottom.xml b/widget/testdata/menu/mobile/drag_bottom.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="28x90" type="*widget.Scroll">
 					<widget pos="0,-112" size="28x202" type="*widget.menuBox">
+						<rectangle fillColor="background" size="28x210"/>
 						<container pos="0,4" size="28x210">
 							<widget size="28x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -39,7 +40,8 @@
 						</container>
 					</widget>
 					<widget pos="22,0" size="6x90" type="*widget.scrollBarArea">
-						<widget backgroundColor="scrollbar" pos="3,49" size="3x40" type="*widget.scrollBar">
+						<widget pos="3,49" size="3x40" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x40"/>
 						</widget>
 					</widget>
 					<widget size="28x0" type="*widget.Shadow">

diff --git a/widget/testdata/menu/mobile/drag_middle.xml b/widget/testdata/menu/mobile/drag_middle.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="28x90" type="*widget.Scroll">
 					<widget pos="0,-50" size="28x202" type="*widget.menuBox">
+						<rectangle fillColor="background" size="28x210"/>
 						<container pos="0,4" size="28x210">
 							<widget size="28x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -39,7 +40,8 @@
 						</container>
 					</widget>
 					<widget pos="22,0" size="6x90" type="*widget.scrollBarArea">
-						<widget backgroundColor="scrollbar" pos="3,22" size="3x40" type="*widget.scrollBar">
+						<widget pos="3,22" size="3x40" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x40"/>
 						</widget>
 					</widget>
 					<widget size="28x0" type="*widget.Shadow">

diff --git a/widget/testdata/menu/mobile/drag_top.xml b/widget/testdata/menu/mobile/drag_top.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="28x90" type="*widget.Scroll">
 					<widget size="28x202" type="*widget.menuBox">
+						<rectangle fillColor="background" size="28x210"/>
 						<container pos="0,4" size="28x210">
 							<widget size="28x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -39,7 +40,8 @@
 						</container>
 					</widget>
 					<widget pos="22,0" size="6x90" type="*widget.scrollBarArea">
-						<widget backgroundColor="scrollbar" pos="3,0" size="3x40" type="*widget.scrollBar">
+						<widget pos="3,0" size="3x40" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x40"/>
 						</widget>
 					</widget>
 					<widget pos="0,90" size="28x0" type="*widget.Shadow">

diff --git a/widget/testdata/menu/mobile/layout_background_reset.xml b/widget/testdata/menu/mobile/layout_background_reset.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>

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
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -47,6 +48,7 @@
 					</widget>
 					<widget size="153x103" type="*widget.Scroll">
 						<widget size="153x103" type="*widget.menuBox">
+							<rectangle fillColor="background" size="153x111"/>
 							<container pos="0,4" size="153x111">
 								<widget size="153x29" type="*widget.menuItem">
 									<text pos="8,4" size="72x21">subitem A</text>
@@ -74,6 +76,7 @@
 						</widget>
 						<widget size="159x70" type="*widget.Scroll">
 							<widget size="159x70" type="*widget.menuBox">
+								<rectangle fillColor="background" size="159x78"/>
 								<container pos="0,4" size="159x78">
 									<widget size="159x29" type="*widget.menuItem">
 										<text pos="8,4" size="143x21">subsubitem A (long)</text>

diff --git a/widget/testdata/menu/mobile/layout_no_space_on_right.xml b/widget/testdata/menu/mobile/layout_no_space_on_right.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -47,6 +48,7 @@
 					</widget>
 					<widget size="153x103" type="*widget.Scroll">
 						<widget size="153x103" type="*widget.menuBox">
+							<rectangle fillColor="background" size="153x111"/>
 							<container pos="0,4" size="153x111">
 								<widget size="153x29" type="*widget.menuItem">
 									<text pos="8,4" size="72x21">subitem A</text>
@@ -74,6 +76,7 @@
 						</widget>
 						<widget size="159x70" type="*widget.Scroll">
 							<widget size="159x70" type="*widget.menuBox">
+								<rectangle fillColor="background" size="159x78"/>
 								<container pos="0,4" size="159x78">
 									<widget size="159x29" type="*widget.menuItem">
 										<text pos="8,4" size="143x21">subsubitem A (long)</text>

diff --git a/widget/testdata/menu/mobile/layout_normal.xml b/widget/testdata/menu/mobile/layout_normal.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>

diff --git a/widget/testdata/menu/mobile/layout_normal_with_submenus.xml b/widget/testdata/menu/mobile/layout_normal_with_submenus.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -47,6 +48,7 @@
 					</widget>
 					<widget size="153x103" type="*widget.Scroll">
 						<widget size="153x103" type="*widget.menuBox">
+							<rectangle fillColor="background" size="153x111"/>
 							<container pos="0,4" size="153x111">
 								<widget size="153x29" type="*widget.menuItem">
 									<text pos="8,4" size="72x21">subitem A</text>
@@ -74,6 +76,7 @@
 						</widget>
 						<widget size="159x70" type="*widget.Scroll">
 							<widget size="159x70" type="*widget.menuBox">
+								<rectangle fillColor="background" size="159x78"/>
 								<container pos="0,4" size="159x78">
 									<widget size="159x29" type="*widget.menuItem">
 										<text pos="8,4" size="143x21">subsubitem A (long)</text>

diff --git a/widget/testdata/menu/mobile/layout_theme_changed.xml b/widget/testdata/menu/mobile/layout_theme_changed.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>

diff --git a/widget/testdata/menu/mobile/layout_window_too_short.xml b/widget/testdata/menu/mobile/layout_window_too_short.xml
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x40" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -34,7 +35,8 @@
 						</container>
 					</widget>
 					<widget pos="65,0" size="6x40" type="*widget.scrollBarArea">
-						<widget backgroundColor="scrollbar" pos="3,0" size="3x16" type="*widget.scrollBar">
+						<widget pos="3,0" size="3x16" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x16"/>
 						</widget>
 					</widget>
 					<widget pos="0,40" size="71x0" type="*widget.Shadow">

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
@@ -17,6 +17,7 @@
 				</widget>
 				<widget size="71x108" type="*widget.Scroll">
 					<widget size="71x108" type="*widget.menuBox">
+						<rectangle fillColor="background" size="71x116"/>
 						<container pos="0,4" size="71x116">
 							<widget size="71x29" type="*widget.menuItem">
 								<text pos="8,4" size="10x21">A</text>
@@ -47,6 +48,7 @@
 					</widget>
 					<widget size="153x103" type="*widget.Scroll">
 						<widget size="153x103" type="*widget.menuBox">
+							<rectangle fillColor="background" size="153x111"/>
 							<container pos="0,4" size="153x111">
 								<widget size="153x29" type="*widget.menuItem">
 									<text pos="8,4" size="72x21">subitem A</text>
@@ -74,6 +76,7 @@
 						</widget>
 						<widget size="159x70" type="*widget.Scroll">
 							<widget size="159x70" type="*widget.menuBox">
+								<rectangle fillColor="background" size="159x78"/>
 								<container pos="0,4" size="159x78">
 									<widget size="159x29" type="*widget.menuItem">
 										<text pos="8,4" size="143x21">subsubitem A (long)</text>