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.

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

Fixed scrollbar disappearing after changing content #2303

Merged
merged 1 commit into from Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="73x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="73x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="73x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="73x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/change_content_initial.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="73x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="73x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="70x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="70x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="70x20">New 2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="68x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="68x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/change_label_initial.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="73x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="73x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -17,6 +17,14 @@
<text bold pos="8,8" size="64x20">Test5</text>
</widget>
</container>
<widget pos="0,30" size="260x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="202x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="202x3"/>
</widget>
</widget>
<widget pos="260,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="264,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_all_tabs.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_create_tab.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_first.xml
Expand Up @@ -15,6 +15,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_first_close.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_none.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/hover_second.xml
Expand Up @@ -11,6 +11,14 @@
<text bold pos="8,8" size="64x20">Test2</text>
</widget>
</container>
<widget pos="0,30" size="70x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="29x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="29x3"/>
</widget>
</widget>
<widget pos="70,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="74,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Binary file modified container/testdata/doctabs/desktop/single_custom_theme.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tab_location_bottom.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="8,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="0,30" size="19x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="16x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="16x3"/>
</widget>
</widget>
<widget pos="19,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="23,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tab_location_leading.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="4,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="66,0" size="6x-4" type="*widget.scrollBarArea">
<widget pos="3,0" size="3x16" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="3x16"/>
</widget>
</widget>
<widget pos="0,-4" size="72x0" type="*widget.Shadow">
<linearGradient endColor="shadow" pos="0,-8" size="72x8"/>
</widget>
</widget>
<container size="72x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tab_location_top.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="8,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="0,30" size="19x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="16x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="16x3"/>
</widget>
</widget>
<widget pos="19,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="23,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tab_location_trailing.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="4,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="66,0" size="6x-4" type="*widget.scrollBarArea">
<widget pos="3,0" size="3x16" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="3x16"/>
</widget>
</widget>
<widget pos="0,-4" size="72x0" type="*widget.Shadow">
<linearGradient endColor="shadow" pos="0,-8" size="72x8"/>
</widget>
</widget>
<container size="72x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tapped_all_tabs.xml
Expand Up @@ -17,6 +17,14 @@
<text bold color="primary" pos="8,8" size="86x20">Another</text>
</widget>
</container>
<widget pos="0,30" size="220x6" type="*widget.scrollBarArea">
<widget pos="83,3" size="136x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="136x3"/>
</widget>
</widget>
<widget size="0x36" type="*widget.Shadow">
<linearGradient angle="270" size="8x36" startColor="shadow"/>
</widget>
</widget>
<container pos="224,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tapped_create_tab.xml
Expand Up @@ -17,6 +17,14 @@
<text bold color="primary" pos="8,8" size="86x20">Another</text>
</widget>
</container>
<widget pos="0,30" size="220x6" type="*widget.scrollBarArea">
<widget pos="83,3" size="136x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="136x3"/>
</widget>
</widget>
<widget size="0x36" type="*widget.Shadow">
<linearGradient angle="270" size="8x36" startColor="shadow"/>
</widget>
</widget>
<container pos="224,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tapped_first_selected.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="8,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="0,30" size="220x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="193x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="193x3"/>
</widget>
</widget>
<widget pos="220,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="224,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tapped_second_selected.xml
Expand Up @@ -14,6 +14,14 @@
<text bold pos="8,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="0,30" size="220x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="193x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="193x3"/>
</widget>
</widget>
<widget pos="220,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="224,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/desktop/tapped_third_selected.xml
Expand Up @@ -14,6 +14,14 @@
<text bold color="primary" pos="8,8" size="64x20">Test3</text>
</widget>
</container>
<widget pos="0,30" size="220x6" type="*widget.scrollBarArea">
<widget pos="26,3" size="193x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="193x3"/>
</widget>
</widget>
<widget size="0x36" type="*widget.Shadow">
<linearGradient angle="270" size="8x36" startColor="shadow"/>
</widget>
</widget>
<container pos="224,0" size="76x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -17,6 +17,14 @@
</widget>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="81x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="81x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -17,6 +17,14 @@
</widget>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="81x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="81x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
8 changes: 8 additions & 0 deletions container/testdata/doctabs/mobile/change_content_initial.xml
Expand Up @@ -17,6 +17,14 @@
</widget>
</widget>
</container>
<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="81x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="81x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x36" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
</widget>
</widget>
<container pos="114,0" size="36x36">
<widget size="36x36" type="*widget.Button">
Expand Down
Expand Up @@ -17,6 +17,14 @@
<image pos="16,8" rsc="confirmIcon" size="40x40"/>
</widget>
</container>
<widget pos="0,50" size="110x6" type="*widget.scrollBarArea">
<widget pos="0,3" size="81x3" type="*widget.scrollBar">
<rectangle fillColor="scrollbar" size="81x3"/>
</widget>
</widget>
<widget pos="110,0" size="0x56" type="*widget.Shadow">
<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x56"/>
</widget>
</widget>
<container pos="114,0" size="36x56">
<widget size="36x56" type="*widget.Button">
Expand Down