Skip to content

Commit

Permalink
Fix toolbar to be the standard widget height
Browse files Browse the repository at this point in the history 
To do this right then low profile buttons are fixed as well.
This knocked on to accordion (header) and app/doc tabs.
All positive changes IMHO :)

Fixes fyne-io#2257
  • Loading branch information
@andydotxyz
andydotxyz committed May 27, 2021
1 parent 6bc5e58 commit 36b4b52
Show file tree
Hide file tree
Showing 101 changed files with 1,138 additions and 1,156 deletions.
23 changes: 10 additions & 13 deletions container/testdata/apptabs/desktop/hover_overflow.xml
View file
@@ -1,24 +1,21 @@
<canvas size="150x150">
<content>
<widget size="150x150" type="*container.AppTabs">
<container size="150x29">
<container size="118x29">
<widget size="57x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x21">Test1</text>
</widget>
<widget pos="61,0" size="57x29" type="*container.tabButton">
<text alignment="center" bold pos="8,4" size="41x21">Test2</text>
<container size="150x37">
<container size="110x37">
<widget size="57x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x29">Test1</text>
</widget>
</container>
<widget pos="122,0" size="28x29" type="*widget.Button">
<rectangle fillColor="rgba(46,48,48,255)" size="28x29"/>
<widget pos="114,0" size="36x37" type="*widget.Button">
<rectangle fillColor="rgba(46,48,48,255)" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,29" size="150x4"/>
<rectangle fillColor="primary" pos="0,29" size="57x4"/>
<widget pos="0,33" size="150x117" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="150x4"/>
<rectangle fillColor="primary" pos="0,37" size="57x4"/>
<widget pos="0,41" size="150x109" type="*widget.Label">
<text pos="8,8" size="134x21">Text1</text>
</widget>
</widget>
Expand Down
18 changes: 9 additions & 9 deletions container/testdata/apptabs/desktop/tab_location_bottom.xml
View file
@@ -1,16 +1,16 @@
<canvas size="60x70">
<canvas size="60x78">
<content>
<widget size="60x70" type="*container.AppTabs">
<container pos="0,41" size="60x29">
<container size="28x29">
<widget size="57x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x21">Test1</text>
<widget size="60x78" type="*container.AppTabs">
<container pos="0,41" size="60x37">
<container size="20x37">
<widget size="57x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x29">Test1</text>
</widget>
</container>
<widget pos="32,0" size="28x29" type="*widget.Button">
<rectangle fillColor="button" size="28x29"/>
<widget pos="24,0" size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,37" size="60x4"/>
Expand Down
8 changes: 4 additions & 4 deletions container/testdata/apptabs/desktop/tab_location_leading.xml
View file
Expand Up @@ -2,15 +2,15 @@
<content>
<widget size="113x37" type="*container.AppTabs">
<container size="49x37">
<container size="49x4">
<container size="49x-4">
<widget size="49x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="41x21">Test1</text>
</widget>
</container>
<widget pos="0,8" size="49x29" type="*widget.Button">
<rectangle fillColor="button" size="49x29"/>
<widget size="49x37" type="*widget.Button">
<rectangle fillColor="button" size="49x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="14,4" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="14,8" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="49,0" size="4x37"/>
Expand Down
24 changes: 12 additions & 12 deletions container/testdata/apptabs/desktop/tab_location_top.xml
View file
@@ -1,21 +1,21 @@
<canvas size="60x70">
<canvas size="60x78">
<content>
<widget size="60x70" type="*container.AppTabs">
<container size="60x29">
<container size="28x29">
<widget size="57x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x21">Test1</text>
<widget size="60x78" type="*container.AppTabs">
<container size="60x37">
<container size="20x37">
<widget size="57x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x29">Test1</text>
</widget>
</container>
<widget pos="32,0" size="28x29" type="*widget.Button">
<rectangle fillColor="button" size="28x29"/>
<widget pos="24,0" size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,29" size="60x4"/>
<rectangle fillColor="primary" pos="0,29" size="57x4"/>
<widget pos="0,33" size="60x37" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="60x4"/>
<rectangle fillColor="primary" pos="0,37" size="57x4"/>
<widget pos="0,41" size="60x37" type="*widget.Label">
<text pos="8,8" size="44x21">Text 1</text>
</widget>
</widget>
Expand Down
8 changes: 4 additions & 4 deletions container/testdata/apptabs/desktop/tab_location_trailing.xml
View file
Expand Up @@ -2,15 +2,15 @@
<content>
<widget size="113x37" type="*container.AppTabs">
<container pos="64,0" size="49x37">
<container size="49x4">
<container size="49x-4">
<widget size="49x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="41x21">Test1</text>
</widget>
</container>
<widget pos="0,8" size="49x29" type="*widget.Button">
<rectangle fillColor="button" size="49x29"/>
<widget size="49x37" type="*widget.Button">
<rectangle fillColor="button" size="49x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="14,4" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="14,8" rsc="more-vertical.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="60,0" size="4x37"/>
Expand Down
28 changes: 14 additions & 14 deletions container/testdata/apptabs/desktop/tapped_overflow_tabs.xml
View file
@@ -1,31 +1,31 @@
<canvas size="200x100">
<content>
<widget size="200x100" type="*container.AppTabs">
<container size="200x29">
<container size="168x29">
<widget size="57x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x21">Test1</text>
<container size="200x37">
<container size="160x37">
<widget size="57x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="8,4" size="41x29">Test1</text>
</widget>
<widget pos="61,0" size="57x29" type="*container.tabButton">
<text alignment="center" bold pos="8,4" size="41x21">Test2</text>
<widget pos="61,0" size="57x37" type="*container.tabButton">
<text alignment="center" bold pos="8,4" size="41x29">Test2</text>
</widget>
</container>
<widget pos="172,0" size="28x29" type="*widget.Button">
<rectangle fillColor="button" size="28x29"/>
<rectangle fillColor="rgba(0,0,0,0)" pos="0,2" size="24x25"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<widget pos="164,0" size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle fillColor="rgba(0,0,0,0)" pos="0,2" size="32x33"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,29" size="200x4"/>
<rectangle fillColor="primary" pos="0,29" size="57x4"/>
<widget pos="0,33" size="200x67" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="200x4"/>
<rectangle fillColor="primary" pos="0,37" size="57x4"/>
<widget pos="0,41" size="200x59" type="*widget.Label">
<text pos="8,8" size="184x21">Text 1</text>
</widget>
</widget>
</content>
<overlay>
<widget size="200x100" type="*widget.OverlayContainer">
<widget pos="145,29" size="55x70" type="*widget.Menu">
<widget pos="145,30" size="55x70" type="*widget.Menu">
<widget size="55x70" type="*widget.Shadow">
<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
<linearGradient endColor="shadow" pos="0,-4" size="55x4"/>
Expand Down
20 changes: 10 additions & 10 deletions container/testdata/apptabs/mobile/tab_location_bottom.xml
View file
@@ -1,20 +1,20 @@
<canvas size="60x70">
<canvas size="60x78">
<content>
<widget size="60x70" type="*container.AppTabs">
<container pos="0,41" size="60x29">
<container size="28x29">
<widget size="28x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="20x21">Test1</text>
<widget size="60x78" type="*container.AppTabs">
<container pos="0,41" size="60x37">
<container size="20x37">
<widget size="20x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="12x21">Test1</text>
</widget>
</container>
<widget pos="32,0" size="28x29" type="*widget.Button">
<rectangle fillColor="button" size="28x29"/>
<widget pos="24,0" size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,37" size="60x4"/>
<rectangle fillColor="primary" pos="0,37" size="28x4"/>
<rectangle fillColor="primary" pos="0,37" size="20x4"/>
<widget size="60x37" type="*widget.Label">
<text pos="8,8" size="44x21">Text 1</text>
</widget>
Expand Down
24 changes: 12 additions & 12 deletions container/testdata/apptabs/mobile/tab_location_top.xml
View file
@@ -1,21 +1,21 @@
<canvas size="60x70">
<canvas size="60x78">
<content>
<widget size="60x70" type="*container.AppTabs">
<container size="60x29">
<container size="28x29">
<widget size="28x29" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="20x21">Test1</text>
<widget size="60x78" type="*container.AppTabs">
<container size="60x37">
<container size="20x37">
<widget size="20x37" type="*container.tabButton">
<text alignment="center" bold color="primary" pos="4,4" size="12x21">Test1</text>
</widget>
</container>
<widget pos="32,0" size="28x29" type="*widget.Button">
<rectangle fillColor="button" size="28x29"/>
<widget pos="24,0" size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,4" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
<rectangle fillColor="shadow" pos="0,29" size="60x4"/>
<rectangle fillColor="primary" pos="0,29" size="28x4"/>
<widget pos="0,33" size="60x37" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="60x4"/>
<rectangle fillColor="primary" pos="0,37" size="20x4"/>
<widget pos="0,41" size="60x37" type="*widget.Label">
<text pos="8,8" size="44x21">Text 1</text>
</widget>
</widget>
Expand Down
28 changes: 14 additions & 14 deletions container/testdata/doctabs/desktop/change_content_change_hidden.xml
View file
@@ -1,28 +1,28 @@
<canvas size="150x150">
<content>
<widget size="150x150" type="*container.DocTabs">
<container size="150x32">
<widget size="118x32" type="*widget.Scroll">
<container size="166x32">
<widget size="81x32" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x24">Test1</text>
<container size="150x37">
<widget size="110x37" type="*widget.Scroll">
<container size="166x37">
<widget size="81x37" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x29">Test1</text>
</widget>
<widget pos="85,0" size="81x32" type="*container.tabButton">
<text bold pos="8,4" size="65x24">Test2</text>
<widget pos="85,0" size="81x37" type="*container.tabButton">
<text bold pos="8,4" size="65x29">Test2</text>
</widget>
</container>
</widget>
<container pos="122,0" size="28x32">
<widget size="28x32" type="*widget.Button">
<rectangle fillColor="button" size="28x32"/>
<container pos="114,0" size="36x37">
<widget size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,6" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,32" size="150x4"/>
<rectangle fillColor="primary" pos="0,32" size="81x4"/>
<widget pos="0,36" size="150x114" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="150x4"/>
<rectangle fillColor="primary" pos="0,37" size="81x4"/>
<widget pos="0,41" size="150x109" type="*widget.Label">
<text pos="8,8" size="134x21">Text3</text>
</widget>
</widget>
Expand Down
28 changes: 14 additions & 14 deletions container/testdata/doctabs/desktop/change_content_change_visible.xml
View file
@@ -1,28 +1,28 @@
<canvas size="150x150">
<content>
<widget size="150x150" type="*container.DocTabs">
<container size="150x32">
<widget size="118x32" type="*widget.Scroll">
<container size="166x32">
<widget size="81x32" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x24">Test1</text>
<container size="150x37">
<widget size="110x37" type="*widget.Scroll">
<container size="166x37">
<widget size="81x37" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x29">Test1</text>
</widget>
<widget pos="85,0" size="81x32" type="*container.tabButton">
<text bold pos="8,4" size="65x24">Test2</text>
<widget pos="85,0" size="81x37" type="*container.tabButton">
<text bold pos="8,4" size="65x29">Test2</text>
</widget>
</container>
</widget>
<container pos="122,0" size="28x32">
<widget size="28x32" type="*widget.Button">
<rectangle fillColor="button" size="28x32"/>
<container pos="114,0" size="36x37">
<widget size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,6" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,32" size="150x4"/>
<rectangle fillColor="primary" pos="0,32" size="81x4"/>
<widget pos="0,36" size="150x114" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="150x4"/>
<rectangle fillColor="primary" pos="0,37" size="81x4"/>
<widget pos="0,41" size="150x109" type="*widget.Label">
<text pos="8,8" size="134x21">Text3</text>
</widget>
</widget>
Expand Down
28 changes: 14 additions & 14 deletions container/testdata/doctabs/desktop/change_content_initial.xml
View file
@@ -1,28 +1,28 @@
<canvas size="150x150">
<content>
<widget size="150x150" type="*container.DocTabs">
<container size="150x32">
<widget size="118x32" type="*widget.Scroll">
<container size="166x32">
<widget size="81x32" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x24">Test1</text>
<container size="150x37">
<widget size="110x37" type="*widget.Scroll">
<container size="166x37">
<widget size="81x37" type="*container.tabButton">
<text bold color="primary" pos="8,4" size="65x29">Test1</text>
</widget>
<widget pos="85,0" size="81x32" type="*container.tabButton">
<text bold pos="8,4" size="65x24">Test2</text>
<widget pos="85,0" size="81x37" type="*container.tabButton">
<text bold pos="8,4" size="65x29">Test2</text>
</widget>
</container>
</widget>
<container pos="122,0" size="28x32">
<widget size="28x32" type="*widget.Button">
<rectangle fillColor="button" size="28x32"/>
<container pos="114,0" size="36x37">
<widget size="36x37" type="*widget.Button">
<rectangle fillColor="button" size="36x37"/>
<rectangle size="0x0"/>
<image fillMode="contain" pos="4,6" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
</widget>
</container>
</container>
<rectangle fillColor="shadow" pos="0,32" size="150x4"/>
<rectangle fillColor="primary" pos="0,32" size="81x4"/>
<widget pos="0,36" size="150x114" type="*widget.Label">
<rectangle fillColor="shadow" pos="0,37" size="150x4"/>
<rectangle fillColor="primary" pos="0,37" size="81x4"/>
<widget pos="0,41" size="150x109" type="*widget.Label">
<text pos="8,8" size="134x21">Text1</text>
</widget>
</widget>
Expand Down

0 comments on commit 36b4b52

Please sign in to comment.