Merge branch 'develop' into button-locking

dweymouth · Feb 3, 2024 · 9e59817 · 9e59817
2 parents 76cfa85 + 776ac3f
commit 9e59817
Show file tree

Hide file tree

Showing 198 changed files with 1,525 additions and 492 deletions.
diff --git a/container.go b/container.go
@@ -129,12 +129,12 @@ func (c *Container) Refresh() {
 // This method is not intended to be used inside a loop, to remove all the elements.
 // It is much more efficient to call RemoveAll() instead.
 func (c *Container) Remove(rem CanvasObject) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
 	if len(c.Objects) == 0 {
 		return
 	}
 
-	c.lock.Lock()
-	defer c.lock.Unlock()
 	for i, o := range c.Objects {
 		if o != rem {
 			continue

diff --git a/container/testdata/apptabs/desktop/change_content_change_hidden.xml b/container/testdata/apptabs/desktop/change_content_change_hidden.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text3</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text3</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_content_change_visible.xml b/container/testdata/apptabs/desktop/change_content_change_visible.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text3</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text3</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_content_initial.xml b/container/testdata/apptabs/desktop/change_content_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_icon_change_selected.xml b/container/testdata/apptabs/desktop/change_icon_change_selected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_icon_change_unselected.xml b/container/testdata/apptabs/desktop/change_icon_change_unselected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_icon_initial.xml b/container/testdata/apptabs/desktop/change_icon_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_label_change_selected.xml b/container/testdata/apptabs/desktop/change_label_change_selected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="59x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_label_change_unselected.xml b/container/testdata/apptabs/desktop/change_label_change_unselected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="59x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/change_label_initial.xml b/container/testdata/apptabs/desktop/change_label_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/dynamic_appended.xml b/container/testdata/apptabs/desktop/dynamic_appended.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="300x110" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml b/container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml
@@ -11,7 +11,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 2</text>
+				<widget size="300x110" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 2</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml b/container/testdata/apptabs/desktop/dynamic_appended_another_three.xml
@@ -20,7 +20,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 2</text>
+				<widget size="300x110" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 2</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/dynamic_initial.xml b/container/testdata/apptabs/desktop/dynamic_initial.xml
@@ -11,7 +11,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="300x110" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml b/container/testdata/apptabs/desktop/dynamic_replaced_completely.xml
@@ -17,7 +17,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 6</text>
+				<widget size="300x110" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 6</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/hover_first.xml b/container/testdata/apptabs/desktop/hover_first.xml
@@ -15,7 +15,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/hover_none.xml b/container/testdata/apptabs/desktop/hover_none.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/hover_overflow.xml b/container/testdata/apptabs/desktop/hover_overflow.xml
@@ -19,7 +19,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/hover_second.xml b/container/testdata/apptabs/desktop/hover_second.xml
@@ -15,7 +15,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tab_location_bottom.xml b/container/testdata/apptabs/desktop/tab_location_bottom.xml
@@ -16,7 +16,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="88x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="52x4"/>
 			<widget size="88x35" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="88x35" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tab_location_leading.xml b/container/testdata/apptabs/desktop/tab_location_leading.xml
@@ -16,7 +16,9 @@
 			<rectangle fillColor="shadow" pos="48,0" size="4x71"/>
 			<rectangle fillColor="primary" pos="48,0" radius="4" size="4x35"/>
 			<widget pos="52,0" size="54x71" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="54x71" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tab_location_top.xml b/container/testdata/apptabs/desktop/tab_location_top.xml
@@ -16,7 +16,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="88x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="88x35" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="88x35" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tab_location_trailing.xml b/container/testdata/apptabs/desktop/tab_location_trailing.xml
@@ -16,7 +16,9 @@
 			<rectangle fillColor="shadow" pos="54,0" size="4x71"/>
 			<rectangle fillColor="primary" pos="54,0" radius="4" size="4x35"/>
 			<widget size="54x71" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="54x71" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tapped_first_selected.xml b/container/testdata/apptabs/desktop/tapped_first_selected.xml
@@ -17,7 +17,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="200x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="200x60" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="200x60" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml b/container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
@@ -19,7 +19,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="200x4"/>
 			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="200x60" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 1</text>
+				<widget size="200x60" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tapped_second_selected.xml b/container/testdata/apptabs/desktop/tapped_second_selected.xml
@@ -17,7 +17,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="200x4"/>
 			<rectangle fillColor="primary" pos="56,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="200x60" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 2</text>
+				<widget size="200x60" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 2</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/desktop/tapped_third_selected.xml b/container/testdata/apptabs/desktop/tapped_third_selected.xml
@@ -17,7 +17,9 @@
 			<rectangle fillColor="shadow" pos="0,36" size="200x4"/>
 			<rectangle fillColor="primary" pos="112,36" radius="4" size="52x4"/>
 			<widget pos="0,40" size="200x60" type="*widget.Label">
-				<text pos="8,8" size="38x19">Text 3</text>
+				<widget size="200x60" type="*widget.RichText">
+					<text pos="8,8" size="38x19">Text 3</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_content_change_hidden.xml b/container/testdata/apptabs/mobile/change_content_change_hidden.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text3</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text3</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_content_change_visible.xml b/container/testdata/apptabs/mobile/change_content_change_visible.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text3</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text3</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_content_initial.xml b/container/testdata/apptabs/mobile/change_content_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_icon_change_selected.xml b/container/testdata/apptabs/mobile/change_icon_change_selected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,56" radius="4" size="73x4"/>
 			<widget pos="0,60" size="150x90" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x90" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_icon_change_unselected.xml b/container/testdata/apptabs/mobile/change_icon_change_unselected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,56" radius="4" size="73x4"/>
 			<widget pos="0,60" size="150x90" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x90" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_icon_initial.xml b/container/testdata/apptabs/mobile/change_icon_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,56" radius="4" size="73x4"/>
 			<widget pos="0,60" size="150x90" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x90" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_label_change_selected.xml b/container/testdata/apptabs/mobile/change_label_change_selected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_label_change_unselected.xml b/container/testdata/apptabs/mobile/change_label_change_unselected.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>

diff --git a/container/testdata/apptabs/mobile/change_label_initial.xml b/container/testdata/apptabs/mobile/change_label_initial.xml
@@ -14,7 +14,9 @@
 			<rectangle fillColor="shadow" pos="0,35" size="150x4"/>
 			<rectangle fillColor="primary" pos="0,35" radius="4" size="73x4"/>
 			<widget pos="0,39" size="150x110" type="*widget.Label">
-				<text pos="8,8" size="34x19">Text1</text>
+				<widget size="150x110" type="*widget.RichText">
+					<text pos="8,8" size="34x19">Text1</text>
+				</widget>
 			</widget>
 		</widget>
 	</content>