fix broken test

fyne-io · May 15, 2021 · 3814a66 · 3814a66
1 parent 6b7d4bf
commit 3814a66
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 46 deletions.
diff --git a/internal/driver/glfw/testdata/windows_hover_object.xml b/internal/driver/glfw/testdata/windows_hover_object.xml
@@ -3,34 +3,34 @@
 		<widget pos="4,4" size="192x292" type="*widget.List">
 			<widget size="192x292" type="*widget.Scroll">
 				<container size="192x292">
-					<widget size="192x45" type="*widget.listItem">
-						<widget pos="8,4" size="180x37" type="*widget.Entry">
-							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="180x33"/>
-							<rectangle fillColor="shadow" pos="0,35" size="180x2"/>
-							<widget pos="0,2" size="180x33" type="*widget.Scroll">
-								<widget size="180x33" type="*widget.entryContent">
-									<widget size="180x33" type="*widget.textProvider">
-										<text color="placeholder" pos="8,6" size="168x21"></text>
+					<widget size="192x37" type="*widget.listItem">
+						<widget pos="4,0" size="188x37" type="*widget.Entry">
+							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="188x33"/>
+							<rectangle fillColor="shadow" pos="0,35" size="188x2"/>
+							<widget pos="0,2" size="188x33" type="*widget.Scroll">
+								<widget size="188x33" type="*widget.entryContent">
+									<widget size="188x33" type="*widget.textProvider">
+										<text color="placeholder" pos="8,6" size="176x21"></text>
 									</widget>
-									<widget size="180x33" type="*widget.textProvider">
-										<text pos="8,6" size="168x21"></text>
+									<widget size="188x33" type="*widget.textProvider">
+										<text pos="8,6" size="176x21"></text>
 									</widget>
 								</widget>
 							</widget>
 						</widget>
 					</widget>
-					<widget pos="0,46" size="192x45" type="*widget.listItem">
-						<rectangle fillColor="hover" size="192x45"/>
-						<widget pos="8,4" size="180x37" type="*widget.Entry">
-							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="180x33"/>
-							<rectangle fillColor="shadow" pos="0,35" size="180x2"/>
-							<widget pos="0,2" size="180x33" type="*widget.Scroll">
-								<widget size="180x33" type="*widget.entryContent">
-									<widget size="180x33" type="*widget.textProvider">
-										<text color="placeholder" pos="8,6" size="168x21"></text>
+					<widget pos="0,38" size="192x37" type="*widget.listItem">
+						<rectangle fillColor="hover" size="192x37"/>
+						<widget pos="4,0" size="188x37" type="*widget.Entry">
+							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="188x33"/>
+							<rectangle fillColor="shadow" pos="0,35" size="188x2"/>
+							<widget pos="0,2" size="188x33" type="*widget.Scroll">
+								<widget size="188x33" type="*widget.entryContent">
+									<widget size="188x33" type="*widget.textProvider">
+										<text color="placeholder" pos="8,6" size="176x21"></text>
 									</widget>
-									<widget size="180x33" type="*widget.textProvider">
-										<text pos="8,6" size="168x21"></text>
+									<widget size="188x33" type="*widget.textProvider">
+										<text pos="8,6" size="176x21"></text>
 									</widget>
 								</widget>
 							</widget>
@@ -39,7 +39,7 @@
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="disabled" size="0x0"/>
 					</widget>
-					<widget pos="0,45" size="192x1" type="*widget.Separator">
+					<widget pos="0,37" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="disabled" size="192x1"/>
 					</widget>
 				</container>

diff --git 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 @@
 		<widget pos="4,4" size="192x292" type="*widget.List">
 			<widget size="192x292" type="*widget.Scroll">
 				<container size="192x292">
-					<widget size="192x45" type="*widget.listItem">
-						<widget pos="8,4" size="180x37" type="*widget.Entry">
-							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="180x33"/>
-							<rectangle fillColor="shadow" pos="0,35" size="180x2"/>
-							<widget pos="0,2" size="180x33" type="*widget.Scroll">
-								<widget size="180x33" type="*widget.entryContent">
-									<widget size="180x33" type="*widget.textProvider">
-										<text color="placeholder" pos="8,6" size="168x21"></text>
+					<widget size="192x37" type="*widget.listItem">
+						<widget pos="4,0" size="188x37" type="*widget.Entry">
+							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="188x33"/>
+							<rectangle fillColor="shadow" pos="0,35" size="188x2"/>
+							<widget pos="0,2" size="188x33" type="*widget.Scroll">
+								<widget size="188x33" type="*widget.entryContent">
+									<widget size="188x33" type="*widget.textProvider">
+										<text color="placeholder" pos="8,6" size="176x21"></text>
 									</widget>
-									<widget size="180x33" type="*widget.textProvider">
-										<text pos="8,6" size="168x21"></text>
+									<widget size="188x33" type="*widget.textProvider">
+										<text pos="8,6" size="176x21"></text>
 									</widget>
 								</widget>
 							</widget>
 						</widget>
 					</widget>
-					<widget pos="0,46" size="192x45" type="*widget.listItem">
-						<widget pos="8,4" size="180x37" type="*widget.Entry">
-							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="180x33"/>
-							<rectangle fillColor="shadow" pos="0,35" size="180x2"/>
-							<widget pos="0,2" size="180x33" type="*widget.Scroll">
-								<widget size="180x33" type="*widget.entryContent">
-									<widget size="180x33" type="*widget.textProvider">
-										<text color="placeholder" pos="8,6" size="168x21"></text>
+					<widget pos="0,38" size="192x37" type="*widget.listItem">
+						<widget pos="4,0" size="188x37" type="*widget.Entry">
+							<rectangle fillColor="rgba(255,255,255,25)" pos="0,2" size="188x33"/>
+							<rectangle fillColor="shadow" pos="0,35" size="188x2"/>
+							<widget pos="0,2" size="188x33" type="*widget.Scroll">
+								<widget size="188x33" type="*widget.entryContent">
+									<widget size="188x33" type="*widget.textProvider">
+										<text color="placeholder" pos="8,6" size="176x21"></text>
 									</widget>
-									<widget size="180x33" type="*widget.textProvider">
-										<text pos="8,6" size="168x21"></text>
+									<widget size="188x33" type="*widget.textProvider">
+										<text pos="8,6" size="176x21"></text>
 									</widget>
 								</widget>
 							</widget>
@@ -38,7 +38,7 @@
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="disabled" size="0x0"/>
 					</widget>
-					<widget pos="0,45" size="192x1" type="*widget.Separator">
+					<widget pos="0,37" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="disabled" size="192x1"/>
 					</widget>
 				</container>

diff --git a/internal/driver/glfw/window_test.go b/internal/driver/glfw/window_test.go
@@ -282,23 +282,23 @@ func TestWindow_HandleOutsideHoverableObject(t *testing.T) {
 	w.Resize(fyne.NewSize(200, 300))
 	repaintWindow(w)
 
-	w.mouseMoved(w.viewport, 9, 50)
+	w.mouseMoved(w.viewport, 5, 42)
 	w.WaitForEvents()
 	repaintWindow(w)
 	w.mouseLock.RLock()
 	assert.NotNil(t, w.mouseOver)
 	w.mouseLock.RUnlock()
 	test.AssertRendersToMarkup(t, "windows_hover_object.xml", w.Canvas())
 
-	w.mouseMoved(w.viewport, 50, 50)
+	w.mouseMoved(w.viewport, 42, 42)
 	w.WaitForEvents()
 	repaintWindow(w)
 	w.mouseLock.RLock()
 	assert.NotNil(t, w.mouseOver)
 	w.mouseLock.RUnlock()
 	test.AssertRendersToMarkup(t, "windows_hover_object.xml", w.Canvas())
 
-	w.mouseMoved(w.viewport, 50, 100)
+	w.mouseMoved(w.viewport, 42, 100)
 	w.WaitForEvents()
 	repaintWindow(w)
 	w.mouseLock.RLock()