Merge branch 'release/v2.3.x'

fyne-io · Jun 6, 2023 · 1834d70 · 1834d70
2 parents b5dab11 + 5ee6eba
commit 1834d70
Show file tree

Hide file tree

Showing 53 changed files with 331 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,28 @@
 This file lists the main changes with each version of the Fyne toolkit.
 More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases). 
 
+## 2.3.5 - 6 June 2023
+
+### Fixed
+
+* Panic with unsupported font (#3646)
+* Temporary manifest file not closed after building on Windows
+* Panic when using autogenerated quit menu and having unshown windows (#3870)
+* Using `canvas.ImageScaleFastest` not working on arm64 (#3891)
+* Disabled password Entry should also disable the ActionItem (#3908)
+* Disabled RadioGroup does not display status (#3882)
+* Negative TableCellID Row (#2857)
+* Make sure we have sufficient space for the bar as well if content is tiny (#3898)
+* Leak in image painter when replacing image.Image source regularly
+* Links in Markdown/Rich Text lists breaks formatting (#2911)
+* Crash when reducing window to taskbar with popup opened (#3877)
+* RichText vertical scroll will truncate long content with horizontal lines (#3929)
+* Custom metadata would not apply with `fyne release` command
+* Horizontal CheckGroup overlap when having long text (#3005)
+* Fix focused colour of coloured buttons (#3462)
+* Menu separator not visible with light theme (#3814)
+
+
 ## 2.3.4 - 3 May 2023
 
 ### Fixed

diff --git a/cmd/fyne/internal/commands/package-windows.go b/cmd/fyne/internal/commands/package-windows.go
@@ -66,6 +66,7 @@ func (p *Packager) packageWindows() error {
 		if err != nil {
 			return fmt.Errorf("failed to write manifest template: %w", err)
 		}
+		manifestFile.Close()
 	}
 
 	// launch rsrc to generate the object file

diff --git a/cmd/fyne/internal/commands/release.go b/cmd/fyne/internal/commands/release.go
@@ -121,6 +121,11 @@ func Release() *cli.Command {
 				Value:       "",
 				Destination: &r.icon,
 			},
+			&cli.GenericFlag{
+				Name:  "metadata",
+				Usage: "Specify custom metadata key value pair that you do not want to store in your FyneApp.toml (key=value)",
+				Value: &r.customMetadata,
+			},
 		},
 		Action: r.releaseAction,
 	}

diff --git a/container/tabs.go b/container/tabs.go
@@ -365,7 +365,23 @@ func (r *baseTabsRenderer) layout(t baseTabs, size fyne.Size) {
 }
 
 func (r *baseTabsRenderer) minSize(t baseTabs) fyne.Size {
+	pad := theme.Padding()
+	buttonPad := pad
 	barMin := r.bar.MinSize()
+	tabsMin := r.bar.Objects[0].MinSize()
+	accessory := r.bar.Objects[1]
+	accessoryMin := accessory.MinSize()
+	if scroll, ok := r.bar.Objects[0].(*Scroll); ok && len(scroll.Content.(*fyne.Container).Objects) == 0 {
+		tabsMin = fyne.Size{} // scroller forces 32 where we don't need any space
+		buttonPad = 0
+	} else if group, ok := r.bar.Objects[0].(*fyne.Container); ok && len(group.Objects) > 0 {
+		tabsMin = group.Objects[0].MinSize()
+		buttonPad = 0
+	}
+	if !accessory.Visible() || accessoryMin.Width == 0 {
+		buttonPad = 0
+		accessoryMin = fyne.Size{}
+	}
 
 	contentMin := fyne.NewSize(0, 0)
 	for _, content := range t.items() {
@@ -374,9 +390,11 @@ func (r *baseTabsRenderer) minSize(t baseTabs) fyne.Size {
 
 	switch t.tabLocation() {
 	case TabLocationLeading, TabLocationTrailing:
-		return fyne.NewSize(barMin.Width+contentMin.Width+theme.Padding(), contentMin.Height)
+		return fyne.NewSize(barMin.Width+contentMin.Width+pad,
+			fyne.Max(contentMin.Height, accessoryMin.Height+buttonPad+tabsMin.Height))
 	default:
-		return fyne.NewSize(contentMin.Width, barMin.Height+contentMin.Height+theme.Padding())
+		return fyne.NewSize(fyne.Max(contentMin.Width, accessoryMin.Width+buttonPad+tabsMin.Width),
+			barMin.Height+contentMin.Height+pad)
 	}
 }
 

diff --git a/container/testdata/apptabs/desktop/tab_location_bottom.xml b/container/testdata/apptabs/desktop/tab_location_bottom.xml
@@ -1,21 +1,21 @@
-<canvas size="54x75">
+<canvas size="88x75">
 	<content>
-		<widget size="54x75" type="*container.AppTabs">
-			<container pos="0,39" size="54x36">
-				<container size="14x36">
+		<widget size="88x75" type="*container.AppTabs">
+			<container pos="0,39" size="88x36">
+				<container size="48x36">
 					<widget size="52x36" type="*container.tabButton">
 						<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
 					</widget>
 				</container>
-				<widget pos="18,0" size="36x36" type="*widget.Button">
+				<widget pos="52,0" size="36x36" type="*widget.Button">
 					<rectangle size="36x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="0,35" size="54x4"/>
+			<rectangle fillColor="shadow" pos="0,35" size="88x4"/>
 			<rectangle fillColor="primary" pos="0,35" size="52x4"/>
-			<widget size="54x35" type="*widget.Label">
+			<widget size="88x35" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/apptabs/desktop/tab_location_leading.xml b/container/testdata/apptabs/desktop/tab_location_leading.xml
@@ -1,21 +1,21 @@
-<canvas size="106x35">
+<canvas size="106x71">
 	<content>
-		<widget size="106x35" type="*container.AppTabs">
-			<container size="48x35">
-				<container size="48x-4">
+		<widget size="106x71" type="*container.AppTabs">
+			<container size="48x71">
+				<container size="48x31">
 					<widget size="48x35" type="*container.tabButton">
 						<text alignment="center" bold color="primary" pos="4,8" size="40x19">Test1</text>
 					</widget>
 				</container>
-				<widget size="48x36" type="*widget.Button">
+				<widget pos="0,35" size="48x36" type="*widget.Button">
 					<rectangle size="48x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="14,8" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="48,0" size="4x35"/>
+			<rectangle fillColor="shadow" pos="48,0" size="4x71"/>
 			<rectangle fillColor="primary" pos="48,0" size="4x35"/>
-			<widget pos="52,0" size="54x35" type="*widget.Label">
+			<widget pos="52,0" size="54x71" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/apptabs/desktop/tab_location_top.xml b/container/testdata/apptabs/desktop/tab_location_top.xml
@@ -1,21 +1,21 @@
-<canvas size="54x75">
+<canvas size="88x75">
 	<content>
-		<widget size="54x75" type="*container.AppTabs">
-			<container size="54x36">
-				<container size="14x36">
+		<widget size="88x75" type="*container.AppTabs">
+			<container size="88x36">
+				<container size="48x36">
 					<widget size="52x36" type="*container.tabButton">
 						<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
 					</widget>
 				</container>
-				<widget pos="18,0" size="36x36" type="*widget.Button">
+				<widget pos="52,0" size="36x36" type="*widget.Button">
 					<rectangle size="36x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="0,36" size="54x4"/>
+			<rectangle fillColor="shadow" pos="0,36" size="88x4"/>
 			<rectangle fillColor="primary" pos="0,36" size="52x4"/>
-			<widget pos="0,40" size="54x35" type="*widget.Label">
+			<widget pos="0,40" size="88x35" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/apptabs/desktop/tab_location_trailing.xml b/container/testdata/apptabs/desktop/tab_location_trailing.xml
@@ -1,21 +1,21 @@
-<canvas size="106x35">
+<canvas size="106x71">
 	<content>
-		<widget size="106x35" type="*container.AppTabs">
-			<container pos="58,0" size="48x35">
-				<container size="48x-4">
+		<widget size="106x71" type="*container.AppTabs">
+			<container pos="58,0" size="48x71">
+				<container size="48x31">
 					<widget size="48x35" type="*container.tabButton">
 						<text alignment="center" bold color="primary" pos="4,8" size="40x19">Test1</text>
 					</widget>
 				</container>
-				<widget size="48x36" type="*widget.Button">
+				<widget pos="0,35" size="48x36" type="*widget.Button">
 					<rectangle size="48x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="14,8" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="54,0" size="4x35"/>
+			<rectangle fillColor="shadow" pos="54,0" size="4x71"/>
 			<rectangle fillColor="primary" pos="54,0" size="4x35"/>
-			<widget size="54x35" type="*widget.Label">
+			<widget size="54x71" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/apptabs/mobile/tab_location_bottom.xml b/container/testdata/apptabs/mobile/tab_location_bottom.xml
@@ -1,21 +1,21 @@
-<canvas size="54x75">
+<canvas size="84x75">
 	<content>
-		<widget size="54x75" type="*container.AppTabs">
-			<container pos="0,39" size="54x36">
-				<container size="14x36">
-					<widget size="14x36" type="*container.tabButton">
-						<text alignment="center" bold color="primary" pos="4,8" size="6x19">Test1</text>
+		<widget size="84x75" type="*container.AppTabs">
+			<container pos="0,39" size="84x36">
+				<container size="44x36">
+					<widget size="44x36" type="*container.tabButton">
+						<text alignment="center" bold color="primary" pos="4,8" size="36x19">Test1</text>
 					</widget>
 				</container>
-				<widget pos="18,0" size="36x36" type="*widget.Button">
+				<widget pos="48,0" size="36x36" type="*widget.Button">
 					<rectangle size="36x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="0,35" size="54x4"/>
-			<rectangle fillColor="primary" pos="0,35" size="14x4"/>
-			<widget size="54x35" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,35" size="84x4"/>
+			<rectangle fillColor="primary" pos="0,35" size="44x4"/>
+			<widget size="84x35" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/apptabs/mobile/tab_location_top.xml b/container/testdata/apptabs/mobile/tab_location_top.xml
@@ -1,21 +1,21 @@
-<canvas size="54x75">
+<canvas size="84x75">
 	<content>
-		<widget size="54x75" type="*container.AppTabs">
-			<container size="54x36">
-				<container size="14x36">
-					<widget size="14x36" type="*container.tabButton">
-						<text alignment="center" bold color="primary" pos="4,8" size="6x19">Test1</text>
+		<widget size="84x75" type="*container.AppTabs">
+			<container size="84x36">
+				<container size="44x36">
+					<widget size="44x36" type="*container.tabButton">
+						<text alignment="center" bold color="primary" pos="4,8" size="36x19">Test1</text>
 					</widget>
 				</container>
-				<widget pos="18,0" size="36x36" type="*widget.Button">
+				<widget pos="48,0" size="36x36" type="*widget.Button">
 					<rectangle size="36x36"/>
 					<rectangle size="0x0"/>
 					<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 				</widget>
 			</container>
-			<rectangle fillColor="shadow" pos="0,36" size="54x4"/>
-			<rectangle fillColor="primary" pos="0,36" size="14x4"/>
-			<widget pos="0,40" size="54x35" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,36" size="84x4"/>
+			<rectangle fillColor="primary" pos="0,36" size="44x4"/>
+			<widget pos="0,40" size="84x35" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/doctabs/desktop/tab_location_bottom.xml b/container/testdata/doctabs/desktop/tab_location_bottom.xml
@@ -1,8 +1,8 @@
-<canvas size="54x75">
+<canvas size="72x75">
 	<content>
-		<widget size="54x75" type="*container.DocTabs">
-			<container pos="0,39" size="54x36">
-				<widget size="14x36" type="*widget.Scroll">
+		<widget size="72x75" type="*container.DocTabs">
+			<container pos="0,39" size="72x36">
+				<widget size="32x36" type="*widget.Scroll">
 					<container size="237x36">
 						<widget size="76x36" type="*container.tabButton">
 							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
@@ -14,26 +14,26 @@
 							<text bold pos="8,8" size="60x20">Test3</text>
 						</widget>
 					</container>
-					<widget pos="14,0" size="0x36" type="*widget.Shadow">
+					<widget pos="32,0" size="0x36" type="*widget.Shadow">
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
-					<widget pos="0,30" size="14x6" type="*widget.scrollBarArea">
+					<widget pos="0,30" size="32x6" type="*widget.scrollBarArea">
 						<widget pos="0,3" size="16x3" type="*widget.scrollBar">
 							<rectangle fillColor="scrollbar" size="16x3"/>
 						</widget>
 					</widget>
 				</widget>
-				<container pos="18,0" size="36x36">
+				<container pos="36,0" size="36x36">
 					<widget size="36x36" type="*widget.Button">
 						<rectangle size="36x36"/>
 						<rectangle size="0x0"/>
 						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,35" size="54x4"/>
-			<rectangle fillColor="primary" pos="0,35" size="14x4"/>
-			<widget size="54x35" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,35" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,35" size="32x4"/>
+			<widget size="72x35" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>

diff --git a/container/testdata/doctabs/desktop/tab_location_leading.xml b/container/testdata/doctabs/desktop/tab_location_leading.xml
@@ -1,8 +1,8 @@
-<canvas size="130x35">
+<canvas size="130x72">
 	<content>
-		<widget size="130x35" type="*container.DocTabs">
-			<container size="72x35">
-				<widget size="72x-4" type="*widget.Scroll">
+		<widget size="130x72" type="*container.DocTabs">
+			<container size="72x72">
+				<widget size="72x32" type="*widget.Scroll">
 					<container size="72x116">
 						<widget size="72x36" type="*container.tabButton">
 							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
@@ -14,26 +14,26 @@
 							<text bold pos="4,8" size="64x19">Test3</text>
 						</widget>
 					</container>
-					<widget pos="0,-4" size="72x0" type="*widget.Shadow">
+					<widget pos="0,32" size="72x0" type="*widget.Shadow">
 						<linearGradient endColor="shadow" pos="0,-8" size="72x8"/>
 					</widget>
-					<widget pos="66,0" size="6x-4" type="*widget.scrollBarArea">
+					<widget pos="66,0" size="6x32" type="*widget.scrollBarArea">
 						<widget pos="3,0" size="3x16" type="*widget.scrollBar">
 							<rectangle fillColor="scrollbar" size="3x16"/>
 						</widget>
 					</widget>
 				</widget>
-				<container size="72x36">
+				<container pos="0,36" size="72x36">
 					<widget size="36x36" type="*widget.Button">
 						<rectangle size="36x36"/>
 						<rectangle size="0x0"/>
 						<image fillMode="contain" pos="8,8" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="72,0" size="4x35"/>
-			<rectangle pos="72,0" size="4x35"/>
-			<widget pos="76,0" size="54x35" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="72,0" size="4x72"/>
+			<rectangle fillColor="primary" pos="72,0" size="4x32"/>
+			<widget pos="76,0" size="54x72" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
 		</widget>