Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to have theme overrides for a widget/container #4313

Merged
merged 53 commits into from
Feb 1, 2024
Merged

Ability to have theme overrides for a widget/container #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
17bbf75
Add new theme methods which mirror Theme API so we can avoid explosio…
andydotxyz Oct 9, 2023
5e419b2
Show how theme overrides could work for the standard widgets
andydotxyz Oct 9, 2023
f4a18ec
Clear the theme override cache when we are un-rendered
andydotxyz Oct 9, 2023
cc606ab
Correct direct comparison of the structs where parent was set in widget
andydotxyz Oct 9, 2023
20135cb
Simplify label render setup
andydotxyz Oct 18, 2023
0c684e2
Add `ForWidget` to themed resources so we can theme for the override
andydotxyz Nov 20, 2023
72d621f
Add the discussed `CurrentForWidget` lookup to `theme` package, and m…
andydotxyz Nov 20, 2023
f7d9dfb
Add size lookups and update Button/Label/RichText to demo this
andydotxyz Nov 20, 2023
2036058
Merge branch 'develop' into feature/themewidgets
andydotxyz Dec 4, 2023
04cf98b
Correctly look up sizing for Button, Label and RichText
andydotxyz Dec 5, 2023
35ba353
Merge branch 'develop' into feature/themewidgets
andydotxyz Dec 6, 2023
4817bb0
Update Entry to use the RichText sizing with theme overrides
andydotxyz Dec 6, 2023
f468cf0
Fixing up broken tests in recent changes for theming
andydotxyz Dec 6, 2023
37e85e7
Fix hyperlink test and disambiguate the text helper name
andydotxyz Dec 6, 2023
533d10c
Fixing up more tests as a result of moving RichText to child of Label…
andydotxyz Dec 6, 2023
cd0dd0c
More test clarification and refactoring for text changes
andydotxyz Dec 6, 2023
f570c52
More test files fixed
andydotxyz Dec 6, 2023
2ac2b2d
Last few test file fixes I think
andydotxyz Dec 6, 2023
7aa5c13
Somehow missed two files?
andydotxyz Dec 6, 2023
bb63fe7
Cache the widget theme lookup - now it's faster than without custom t…
andydotxyz Dec 7, 2023
78a568a
Manually fix some changes not tested on darwin
andydotxyz Dec 7, 2023
930e98e
Fix typo copied
andydotxyz Dec 7, 2023
c669994
Support theme overrides in hyperlink
andydotxyz Dec 7, 2023
55195d2
Add a simple image based theme change and override test
andydotxyz Dec 7, 2023
05ccf52
Avoid occasional test failures by using sync test theme handlers
andydotxyz Dec 10, 2023
8da23b6
Merge branch 'develop' into feature/themewidgets
andydotxyz Dec 22, 2023
518dae1
Move to a `container.NewThemeOverride` for a cleaner API and user exp…
andydotxyz Dec 22, 2023
60a3ea8
Moving `ThemedResorce.ForWidget` to internal cache APIs only
andydotxyz Dec 22, 2023
9785fb1
Update theme/theme.go
andydotxyz Dec 30, 2023
71d4b1e
Make the default state (no constructor) useful, and fix missing doc
andydotxyz Jan 2, 2024
7f65696
Fix locking issues from PR review
andydotxyz Jan 2, 2024
2a16326
Refactor so BaseWidget.theme helper is public
andydotxyz Jan 2, 2024
6546175
Add missed fix from locking changes
andydotxyz Jan 2, 2024
64c09eb
Merge branch 'develop' into feature/themewidgets
andydotxyz Jan 2, 2024
bb04226
Fix possible deadlock in some renderers
andydotxyz Jan 2, 2024
ffc26fe
Merge branch 'develop' into feature/themewidgets
andydotxyz Jan 7, 2024
bc45f16
Merge branch 'develop' into feature/themewidgets
andydotxyz Jan 9, 2024
8e76b75
Trying to fix mysterious theme tests that cannot replicate locally
andydotxyz Jan 9, 2024
5412919
Don't use deprecated theme API
andydotxyz Jan 9, 2024
3123fae
Experiment with removing a new theme test...
andydotxyz Jan 9, 2024
06ea6be
Solve issue of resource names colliding when overridden
andydotxyz Jan 11, 2024
43a5bcf
Improve naming, avoid Color vs ColorName confusion
andydotxyz Jan 11, 2024
48fbb19
Add some missing implementations of fyne.ThemedResource
andydotxyz Jan 11, 2024
1cfa0fb
Revert "Add some missing implementations of fyne.ThemedResource"
andydotxyz Jan 11, 2024
df4dbe1
Merge branch 'develop' into feature/themewidgets
andydotxyz Jan 16, 2024
9821e05
Use the right lookup since change in internals
andydotxyz Jan 16, 2024
b161e05
Use atomic counter
andydotxyz Jan 17, 2024
7a63ee9
Use sync to control access to the overrides map
andydotxyz Jan 17, 2024
cb28fec
Remove commended out code and warning
andydotxyz Jan 24, 2024
e619905
Simplify button icon by adopting it in Refresh not SetIcon
andydotxyz Jan 28, 2024
21517c4
Merge branch 'develop' into feature/themewidgets
andydotxyz Jan 28, 2024
cbffb42
Fix some missing icon setting code
andydotxyz Jan 28, 2024
4e2e24c
Merge branch 'develop' into feature/themewidgets
andydotxyz Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_content_change_hidden.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_content_change_visible.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_content_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_icon_change_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_icon_change_unselected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_icon_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_label_change_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_label_change_unselected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/change_label_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/dynamic_appended.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/dynamic_appended_and_removed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/dynamic_appended_another_three.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/dynamic_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/dynamic_replaced_completely.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/hover_first.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/hover_none.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/hover_overflow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/hover_second.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tab_location_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tab_location_leading.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tab_location_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tab_location_trailing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tapped_first_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tapped_second_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/desktop/tapped_third_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_content_change_hidden.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_content_change_visible.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_content_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_icon_change_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_icon_change_unselected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_icon_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_label_change_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_label_change_unselected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/change_label_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion container/testdata/apptabs/mobile/dynamic_appended.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
<rectangle fillColor="shadow" pos="0,35" size="300x4"/>
<rectangle fillColor="primary" pos="0,35" radius="4" size="148x4"/>
<widget pos="0,39" 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>
Expand Down
Loading
Loading