Merge pull request #4052 from andydotxyz/fix/3905

fyne-io · Jul 22, 2023 · 4a0f231 · 4a0f231
2 parents 2f9133e + 53f4c07
commit 4a0f231
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 20 deletions.
diff --git a/container/doctabs.go b/container/doctabs.go
@@ -244,7 +244,12 @@ func (r *docTabsRenderer) Layout(size fyne.Size) {
 	r.updateCreateTab()
 	r.updateTabs()
 	r.layout(r.docTabs, size)
+
+	// lay out buttons before updating indicator, which is relative to their position
+	buttons := r.scroller.Content.(*fyne.Container)
+	buttons.Layout.Layout(buttons.Objects, buttons.Size())
 	r.updateIndicator(r.docTabs.transitioning())
+
 	if r.docTabs.transitioning() {
 		r.docTabs.setTransitioning(false)
 	}

diff --git a/container/doctabs_internal_test.go b/container/doctabs_internal_test.go
@@ -30,3 +30,19 @@ func TestDocTabs_tabButtonRenderer_SetText(t *testing.T) {
 	renderer = cache.Renderer(button).(*tabButtonRenderer)
 	assert.Equal(t, "Replace", renderer.label.Text)
 }
+
+func TestDocTabs_tabButtonRenderer_Remove(t *testing.T) {
+	items := []*TabItem{{Text: "1", Content: widget.NewLabel("Content1")},
+		{Text: "2", Content: widget.NewLabel("Content2")},
+		{Text: "3", Content: widget.NewLabel("Content3")}}
+	tabs := NewDocTabs(items...)
+	tabs.Resize(fyne.NewSize(160, 160))
+	tabRenderer := cache.Renderer(tabs).(*docTabsRenderer)
+
+	tabs.SelectIndex(1)
+	pos := tabRenderer.indicator.Position()
+	tabs.RemoveIndex(0)
+	assert.Equal(t, 0, tabs.SelectedIndex())
+
+	assert.Less(t, tabRenderer.indicator.Position().X, pos.X)
+}
diff --git a/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml b/container/testdata/doctabs/desktop/change_label_to_longer_text_selected.xml
@@ -4,10 +4,10 @@
 			<container size="500x36">
 				<widget size="460x36" type="*widget.Scroll">
 					<container size="460x36">
-						<widget size="83x36" type="*container.tabButton">
-							<text bold color="primary" pos="8,8" size="67x20">New longer text 1</text>
+						<widget size="164x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="148x20">New longer text 1</text>
 						</widget>
-						<widget pos="87,0" size="83x36" type="*container.tabButton">
+						<widget pos="168,0" size="83x36" type="*container.tabButton">
 							<text bold pos="8,8" size="67x20">New 2</text>
 						</widget>
 					</container>

diff --git a/container/testdata/doctabs/desktop/dynamic_appended.xml b/container/testdata/doctabs/desktop/dynamic_appended.xml
@@ -7,8 +7,8 @@
 						<widget size="76x36" type="*container.tabButton">
 							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
 						</widget>
-						<widget size="0x0" type="*container.tabButton">
-							<text bold size="0x0">Test2</text>
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
 						</widget>
 					</container>
 				</widget>

diff --git a/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml b/container/testdata/doctabs/desktop/dynamic_appended_and_removed.xml
@@ -4,8 +4,8 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="0x0" type="*container.tabButton">
-							<text bold color="primary" size="0x0">Test2</text>
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test2</text>
 						</widget>
 					</container>
 				</widget>

diff --git a/container/testdata/doctabs/mobile/dynamic_appended.xml b/container/testdata/doctabs/mobile/dynamic_appended.xml
@@ -4,16 +4,16 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="260x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="252x19">Test1</text>
-							<widget pos="236,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="128x36" type="*container.tabButton">
+							<text bold color="primary" pos="4,8" size="120x19">Test1</text>
+							<widget pos="104,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget size="0x0" type="*container.tabButton">
-							<text bold size="0x0">Test2</text>
-							<widget size="0x0" type="*container.tabCloseButton">
-								<image rsc="cancelIcon" size="0x0"/>
+						<widget pos="132,0" size="128x36" type="*container.tabButton">
+							<text bold pos="4,8" size="120x19">Test2</text>
+							<widget pos="104,8" size="20x20" type="*container.tabCloseButton">
+								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
 					</container>
@@ -27,7 +27,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" size="260x4"/>
+			<rectangle fillColor="primary" pos="0,36" size="128x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>

diff --git a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
@@ -4,10 +4,10 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="0x0" type="*container.tabButton">
-							<text bold color="primary" size="0x0">Test2</text>
-							<widget size="0x0" type="*container.tabCloseButton">
-								<image rsc="cancelIcon" size="0x0" themed="primary"/>
+						<widget size="260x36" type="*container.tabButton">
+							<text bold color="primary" pos="4,8" size="252x19">Test2</text>
+							<widget pos="236,8" size="20x20" type="*container.tabCloseButton">
+								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
 					</container>
@@ -21,7 +21,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" size="260x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 2</text>
 			</widget>