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

Jump to bottom

new on background colors #4959

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

new on background colors #4959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb54c3a
[theme] introduce new `*OnBackground` color names
toaster Jun 22, 2024
1cdfd25
[widget][theme] use errorOnBackground color instead of error where ap…
toaster Jun 22, 2024
ca360d4
[widget][theme] use primaryOnBackground color instead of primary wher…
toaster Jun 22, 2024
02db92e
[widget][theme] use successOnBackground color instead of success wher…
toaster Jun 18, 2024
7641a44
[widget][theme] use warningOnBackground color instead of warning wher…
toaster Jun 18, 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
2 changes: 1 addition & 1 deletion container/apptabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (t *AppTabs) CreateRenderer() fyne.WidgetRenderer {
baseTabsRenderer: baseTabsRenderer{
bar: &fyne.Container{},
divider: canvas.NewRectangle(theme.Color(theme.ColorNameShadow)),
indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimary)),
indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimaryOnBackground)),
},
appTabs: t,
}
Expand Down
8 changes: 4 additions & 4 deletions container/apptabs_extend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ func TestAppTabs_Extended_Tapped(t *testing.T) {
tab1 := r.bar.Objects[0].(*fyne.Container).Objects[0].(*tabButton)
tab2 := r.bar.Objects[0].(*fyne.Container).Objects[1].(*tabButton)
require.Equal(t, 0, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)

tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())

tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())

tab1.Tapped(&fyne.PointEvent{})
assert.Equal(t, 0, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.True(t, tabs.Items[0].Content.Visible())
assert.False(t, tabs.Items[1].Content.Visible())
Expand Down
2 changes: 1 addition & 1 deletion container/doctabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (t *DocTabs) CreateRenderer() fyne.WidgetRenderer {
baseTabsRenderer: baseTabsRenderer{
bar: &fyne.Container{},
divider: canvas.NewRectangle(theme.Color(theme.ColorNameShadow)),
indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimary)),
indicator: canvas.NewRectangle(theme.Color(theme.ColorNamePrimaryOnBackground)),
},
docTabs: t,
scroller: NewScroll(&fyne.Container{}),
Expand Down
8 changes: 4 additions & 4 deletions container/doctabs_extend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ func TestDocTabs_Extended_Tapped(t *testing.T) {
tab1 := buttons[0].(*tabButton)
tab2 := buttons[1].(*tabButton)
require.Equal(t, 0, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)

tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())

tab2.Tapped(&fyne.PointEvent{})
assert.Equal(t, 1, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.False(t, tabs.Items[0].Content.Visible())
assert.True(t, tabs.Items[1].Content.Visible())

tab1.Tapped(&fyne.PointEvent{})
assert.Equal(t, 0, tabs.SelectedIndex())
require.Equal(t, theme.Color(theme.ColorNamePrimary), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNamePrimaryOnBackground), test.TempWidgetRenderer(t, tab1).(*tabButtonRenderer).label.Color)
require.Equal(t, theme.Color(theme.ColorNameForeground), test.TempWidgetRenderer(t, tab2).(*tabButtonRenderer).label.Color)
assert.True(t, tabs.Items[0].Content.Visible())
assert.False(t, tabs.Items[1].Content.Visible())
Expand Down
6 changes: 3 additions & 3 deletions container/tabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ func (r *baseTabsRenderer) applyTheme(t baseTabs) {
r.action.SetIcon(moreIcon(t))
}
r.divider.FillColor = theme.Color(theme.ColorNameShadow)
r.indicator.FillColor = theme.Color(theme.ColorNamePrimary)
r.indicator.FillColor = theme.Color(theme.ColorNamePrimaryOnBackground)
r.indicator.CornerRadius = theme.SelectionRadiusSize()

for _, tab := range r.tabs.items() {
Expand Down Expand Up @@ -425,7 +425,7 @@ func (r *baseTabsRenderer) moveIndicator(pos fyne.Position, siz fyne.Size, anima
r.sizeAnimation = nil
}

r.indicator.FillColor = theme.Color(theme.ColorNamePrimary)
r.indicator.FillColor = theme.Color(theme.ColorNamePrimaryOnBackground)
if r.indicator.Position().IsZero() {
r.indicator.Move(pos)
r.indicator.Resize(siz)
Expand Down Expand Up @@ -670,7 +670,7 @@ func (r *tabButtonRenderer) Refresh() {
r.label.Alignment = r.button.textAlignment
if !r.button.Disabled() {
if r.button.importance == widget.HighImportance {
r.label.Color = theme.Color(theme.ColorNamePrimary)
r.label.Color = theme.Color(theme.ColorNamePrimaryOnBackground)
} else {
r.label.Color = theme.Color(theme.ColorNameForeground)
}
Expand Down
2 changes: 1 addition & 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 @@ -12,7 +12,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="28x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
2 changes: 1 addition & 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 @@ -12,7 +12,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="28x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
2 changes: 1 addition & 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 @@ -12,7 +12,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="28x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="28x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,15 +4,15 @@
<container size="150x36">
<container size="150x36">
<widget size="59x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="43x20">New 1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="43x20">New 1</text>
</widget>
<widget pos="63,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="59x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="59x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,15 +4,15 @@
<container size="150x36">
<container size="150x36">
<widget size="59x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="43x20">New 1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="43x20">New 1</text>
</widget>
<widget pos="63,0" size="59x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="43x20">New 2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="59x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="59x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,15 +4,15 @@
<container size="150x36">
<container size="150x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/dynamic_appended.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<container size="300x36">
<container size="300x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="300x110" type="*widget.Label">
<widget size="300x110" type="*widget.RichText">
<text pos="8,8" size="38x19">Text 1</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,12 +4,12 @@
<container size="300x36">
<container size="300x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test2</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="300x110" type="*widget.Label">
<widget size="300x110" type="*widget.RichText">
<text pos="8,8" size="38x19">Text 2</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,7 +4,7 @@
<container size="300x36">
<container size="300x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test2</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test2</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test3</text>
Expand All @@ -18,7 +18,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="300x110" type="*widget.Label">
<widget size="300x110" type="*widget.RichText">
<text pos="8,8" size="38x19">Text 2</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/dynamic_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<container size="300x36">
<container size="300x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="300x110" type="*widget.Label">
<widget size="300x110" type="*widget.RichText">
<text pos="8,8" size="38x19">Text 1</text>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -4,7 +4,7 @@
<container size="300x36">
<container size="300x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test6</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test6</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test7</text>
Expand All @@ -15,7 +15,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="300x110" type="*widget.Label">
<widget size="300x110" type="*widget.RichText">
<text pos="8,8" size="38x19">Text 6</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/hover_first.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<container size="150x36">
<widget size="52x36" type="*container.tabButton">
<rectangle fillColor="hover" radius="4" size="52x36"/>
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/hover_none.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<container size="150x36">
<container size="150x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/hover_overflow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<container size="150x36">
<container size="110x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<text alignment="center" bold pos="8,8" size="36x20">Test2</text>
Expand All @@ -17,7 +17,7 @@
</widget>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/hover_second.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<container size="150x36">
<container size="150x36">
<widget size="52x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="36x20">Test1</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="36x20">Test1</text>
</widget>
<widget pos="56,0" size="52x36" type="*container.tabButton">
<rectangle fillColor="hover" radius="4" size="52x36"/>
Expand All @@ -13,7 +13,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,36" radius="4" size="52x4"/>
<widget pos="0,40" size="150x110" type="*widget.Label">
<widget size="150x110" type="*widget.RichText">
<text pos="8,8" size="34x19">Text1</text>
Expand Down
2 changes: 1 addition & 1 deletion container/testdata/apptabs/desktop/layout_bottom_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
<rectangle fillColor="primary" pos="0,110" radius="4" size="28x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,110" radius="4" size="28x4"/>
<circle fillColor="background" size="150x110"/>
</widget>
</content>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/layout_bottom_icon_and_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<container pos="0,114" size="150x36">
<container size="150x36">
<widget size="77x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="32,8" size="37x20">Text1</text>
<text alignment="center" bold color="primaryOnBackground" pos="32,8" size="37x20">Text1</text>
<image pos="8,8" rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
<rectangle fillColor="primary" pos="0,110" radius="4" size="77x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,110" radius="4" size="77x4"/>
<circle fillColor="background" size="150x110"/>
</widget>
</content>
Expand Down
4 changes: 2 additions & 2 deletions container/testdata/apptabs/desktop/layout_bottom_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<container pos="0,114" size="150x36">
<container size="150x36">
<widget size="53x36" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,8" size="37x20">Text2</text>
<text alignment="center" bold color="primaryOnBackground" pos="8,8" size="37x20">Text2</text>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
<rectangle fillColor="primary" pos="0,110" radius="4" size="53x4"/>
<rectangle fillColor="primaryOnBackground" pos="0,110" radius="4" size="53x4"/>
<circle fillColor="background" size="150x110"/>
</widget>
</content>
Expand Down
2 changes: 1 addition & 1 deletion container/testdata/apptabs/desktop/layout_leading_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</container>
</container>
<rectangle fillColor="shadow" pos="48,0" size="4x150"/>
<rectangle fillColor="primary" pos="48,0" radius="4" size="4x56"/>
<rectangle fillColor="primaryOnBackground" pos="48,0" radius="4" size="4x56"/>
<circle fillColor="background" pos="52,0" size="98x150"/>
</widget>
</content>
Expand Down
Loading