Merge branch 'develop' into lifecycle-event-queue

dweymouth · Jun 8, 2024 · de250cc · de250cc
2 parents 87ef750 + ef9afc5
commit de250cc
Show file tree

Hide file tree

Showing 162 changed files with 1,469 additions and 1,253 deletions.
diff --git a/cmd/fyne_demo/tutorials/widget.go b/cmd/fyne_demo/tutorials/widget.go
@@ -340,7 +340,34 @@ This styled row should also wrap as expected, but only *when required*.
 }
 
 func makeInputTab(_ fyne.Window) fyne.CanvasObject {
-	selectEntry := widget.NewSelectEntry([]string{"Option A", "Option B", "Option C"})
+	selectEntry := widget.NewSelectEntry([]string{
+		"Option A",
+		"Option B",
+		"Option C",
+		"Option D",
+		"Option E",
+		"Option F",
+		"Option G",
+		"Option H",
+		"Option I",
+		"Option J",
+		"Option K",
+		"Option L",
+		"Option M",
+		"Option N",
+		"Option O",
+		"Option P",
+		"Option Q",
+		"Option R",
+		"Option S",
+		"Option T",
+		"Option U",
+		"Option V",
+		"Option W",
+		"Option X",
+		"Option Y",
+		"Option Z",
+	})
 	selectEntry.PlaceHolder = "Type or select"
 	disabledCheck := widget.NewCheck("Disabled check", func(bool) {})
 	disabledCheck.Disable()

diff --git a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
@@ -26,8 +26,8 @@
 		</widget>
 	</content>
 	<overlay>
-		<widget size="200x100" type="*widget.OverlayContainer">
-			<widget pos="149,25" size="50x74" type="*widget.PopUpMenu">
+		<widget pos="2,3" size="196x95" type="*widget.OverlayContainer">
+			<widget pos="145,20" size="50x74" type="*widget.PopUpMenu">
 				<widget size="50x74" type="*widget.Shadow">
 					<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
 					<linearGradient endColor="shadow" pos="0,-4" size="50x4"/>

diff --git a/container/testdata/doctabs/desktop/tapped_all_tabs.xml b/container/testdata/doctabs/desktop/tapped_all_tabs.xml
@@ -49,19 +49,19 @@
 		</widget>
 	</content>
 	<overlay>
-		<widget size="300x100" type="*widget.OverlayContainer">
-			<widget pos="202,0" size="97x100" type="*widget.PopUpMenu">
-				<widget size="97x100" type="*widget.Shadow">
+		<widget pos="2,3" size="296x95" type="*widget.OverlayContainer">
+			<widget pos="198,0" size="97x98" type="*widget.PopUpMenu">
+				<widget size="97x98" type="*widget.Shadow">
 					<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
 					<linearGradient endColor="shadow" pos="0,-4" size="97x4"/>
 					<radialGradient centerOffset="-0.5,0.5" pos="97,-4" size="4x4" startColor="shadow"/>
-					<linearGradient angle="270" pos="97,0" size="4x100" startColor="shadow"/>
-					<radialGradient centerOffset="-0.5,-0.5" pos="97,100" size="4x4" startColor="shadow"/>
-					<linearGradient pos="0,100" size="97x4" startColor="shadow"/>
-					<radialGradient centerOffset="0.5,-0.5" pos="-4,100" size="4x4" startColor="shadow"/>
-					<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x100"/>
+					<linearGradient angle="270" pos="97,0" size="4x98" startColor="shadow"/>
+					<radialGradient centerOffset="-0.5,-0.5" pos="97,98" size="4x4" startColor="shadow"/>
+					<linearGradient pos="0,98" size="97x4" startColor="shadow"/>
+					<radialGradient centerOffset="0.5,-0.5" pos="-4,98" size="4x4" startColor="shadow"/>
+					<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x98"/>
 				</widget>
-				<widget size="97x100" type="*widget.Scroll">
+				<widget size="97x98" type="*widget.Scroll">
 					<widget size="97x152" type="*widget.menuBox">
 						<rectangle fillColor="menuBackground" size="97x152"/>
 						<container size="97x152">
@@ -80,12 +80,12 @@
 							</widget>
 						</container>
 					</widget>
-					<widget pos="0,100" size="97x0" type="*widget.Shadow">
+					<widget pos="0,98" size="97x0" type="*widget.Shadow">
 						<linearGradient endColor="shadow" pos="0,-8" size="97x8"/>
 					</widget>
-					<widget pos="91,0" size="6x100" type="*widget.scrollBarArea">
-						<widget pos="3,0" size="3x65" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="3x65"/>
+					<widget pos="91,0" size="6x98" type="*widget.scrollBarArea">
+						<widget pos="3,0" size="3x63" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x63"/>
 						</widget>
 					</widget>
 				</widget>

diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml
@@ -61,19 +61,19 @@
 		</widget>
 	</content>
 	<overlay>
-		<widget size="380x100" type="*widget.OverlayContainer">
-			<widget pos="282,0" size="97x100" type="*widget.PopUpMenu">
-				<widget size="97x100" type="*widget.Shadow">
+		<widget pos="2,3" size="376x95" type="*widget.OverlayContainer">
+			<widget pos="278,0" size="97x98" type="*widget.PopUpMenu">
+				<widget size="97x98" type="*widget.Shadow">
 					<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
 					<linearGradient endColor="shadow" pos="0,-4" size="97x4"/>
 					<radialGradient centerOffset="-0.5,0.5" pos="97,-4" size="4x4" startColor="shadow"/>
-					<linearGradient angle="270" pos="97,0" size="4x100" startColor="shadow"/>
-					<radialGradient centerOffset="-0.5,-0.5" pos="97,100" size="4x4" startColor="shadow"/>
-					<linearGradient pos="0,100" size="97x4" startColor="shadow"/>
-					<radialGradient centerOffset="0.5,-0.5" pos="-4,100" size="4x4" startColor="shadow"/>
-					<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x100"/>
+					<linearGradient angle="270" pos="97,0" size="4x98" startColor="shadow"/>
+					<radialGradient centerOffset="-0.5,-0.5" pos="97,98" size="4x4" startColor="shadow"/>
+					<linearGradient pos="0,98" size="97x4" startColor="shadow"/>
+					<radialGradient centerOffset="0.5,-0.5" pos="-4,98" size="4x4" startColor="shadow"/>
+					<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x98"/>
 				</widget>
-				<widget size="97x100" type="*widget.Scroll">
+				<widget size="97x98" type="*widget.Scroll">
 					<widget size="97x152" type="*widget.menuBox">
 						<rectangle fillColor="menuBackground" size="97x152"/>
 						<container size="97x152">
@@ -92,12 +92,12 @@
 							</widget>
 						</container>
 					</widget>
-					<widget pos="0,100" size="97x0" type="*widget.Shadow">
+					<widget pos="0,98" size="97x0" type="*widget.Shadow">
 						<linearGradient endColor="shadow" pos="0,-8" size="97x8"/>
 					</widget>
-					<widget pos="91,0" size="6x100" type="*widget.scrollBarArea">
-						<widget pos="3,0" size="3x65" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="3x65"/>
+					<widget pos="91,0" size="6x98" type="*widget.scrollBarArea">
+						<widget pos="3,0" size="3x63" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="3x63"/>
 						</widget>
 					</widget>
 				</widget>

diff --git a/dialog/file.go b/dialog/file.go
@@ -431,7 +431,7 @@ func (f *fileDialog) setLocation(dir fyne.URI) error {
 		f.files.Unselect(f.selectedID)
 	}
 	if dir == nil {
-		return fmt.Errorf("failed to open nil directory")
+		return errors.New("failed to open nil directory")
 	}
 	list, err := storage.ListerForURI(dir)
 	if err != nil {

diff --git a/go.mod b/go.mod
@@ -3,22 +3,22 @@ module fyne.io/fyne/v2
 go 1.19
 
 require (
-	fyne.io/systray v1.10.1-0.20231230205326-d160fd363db9
-	github.com/BurntSushi/toml v1.3.2
+	fyne.io/systray v1.10.1-0.20240608091126-03c78c0eeffd
+	github.com/BurntSushi/toml v1.4.0
 	github.com/fogleman/gg v1.3.0
 	github.com/fredbi/uri v1.1.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe
 	github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a
 	github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240306074159-ea2d69986ecb
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a
 	github.com/go-ole/go-ole v1.2.6
 	github.com/go-text/render v0.1.0
 	github.com/go-text/typesetting v0.1.0
 	github.com/godbus/dbus/v5 v5.1.0
 	github.com/jackmordaunt/icns/v2 v2.2.6
-	github.com/jeandeaual/go-locale v0.0.0-20240204043739-672d8d016d9a
+	github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49
 	github.com/josephspurrier/goversioninfo v1.4.0
 	github.com/lucor/goinfo v0.9.0
 	github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
@@ -29,13 +29,13 @@ require (
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.4.0
-	github.com/yuin/goldmark v1.5.5
+	github.com/yuin/goldmark v1.7.1
 	golang.org/x/image v0.14.0
 	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a
-	golang.org/x/mod v0.14.0
-	golang.org/x/sys v0.19.0
-	golang.org/x/text v0.14.0
-	golang.org/x/tools v0.16.1
+	golang.org/x/mod v0.17.0
+	golang.org/x/sys v0.20.0
+	golang.org/x/text v0.15.0
+	golang.org/x/tools v0.21.0
 	golang.org/x/tools/go/vcs v0.1.0-deprecated
 )
 
@@ -49,7 +49,8 @@ require (
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )