omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swap toolbar and sidebar

Browse Source
This commit is contained in:
omigamedev
2019-03-04 22:38:26 +01:00
parent 3d9c8742b4
commit 4318fe9728
1 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
data/layout.xml
View File

@@ -1441,10 +1441,10 @@ Here's a list of what's available in this release.
<!--color--> <!--color-->
<text text="Colors" margin="10 0 5 0"/> <text text="Colors" margin="10 0 5 0"/>
<button-custom id="quick-color1" dir="row" pad="4" margin="0 0 1 0"> <button-custom id="quick-color1" dir="row" pad="4" margin="0 0 1 0">
<border color="1 0 0 1" width="60" height="30"/> <border color="0 0 0 1" width="60" height="30"/>
</button-custom> </button-custom>
<button-custom id="quick-color2" pad="4" margin="0 0 1 0"> <button-custom id="quick-color2" pad="4" margin="0 0 1 0">
<border color="0 0 0 1" width="60" height="30"/> <border color="0.5 0.5 0.5 1" width="60" height="30"/>
</button-custom> </button-custom>
<button-custom id="quick-color3" pad="4" margin="0 0 1 0"> <button-custom id="quick-color3" pad="4" margin="0 0 1 0">
<border color="1 1 1 1" width="60" height="30"/> <border color="1 1 1 1" width="60" height="30"/>
@@ -1489,7 +1489,7 @@ Here's a list of what's available in this release.
</node> </node>
</border> </border>
<!-- toolbar --> <!-- toolbar -->
<border id="toolbar" height="50" width="100%" pad="5" dir="row" color=".2 .2 .2 .6" mouse-capture="true"> <border id="toolbar" height="60" width="100%" pad="5" dir="row" color=".2 .2 .2 .6" mouse-capture="true">
<!-- <!--
<button id="btn-open" width="50" height="100%" margin="0 5 0 0" text="Open"/> <button id="btn-open" width="50" height="100%" margin="0 5 0 0" text="Open"/>
<button id="btn-save" width="50" height="100%" margin="0 5 0 0" text="Save"/> <button id="btn-save" width="50" height="100%" margin="0 5 0 0" text="Save"/>
@@ -1515,44 +1515,31 @@ Here's a list of what's available in this release.
</button-custom> </button-custom>
<!--<button id="btn-anim" width="70" height="100%" margin="1 0 0 10" text="Animate"/>--> <!--<button id="btn-anim" width="70" height="100%" margin="1 0 0 10" text="Animate"/>-->
<node dir="row" justify="center" grow="1"> <node dir="row" justify="center" grow="1">
<button-custom id="btn-pen" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2"> <!--panel togglers-->
<image path="data/ui/pen.png" width="100%" height="100%" align="center" justify="flex-end"/> <button-custom id="btn-stroke" width="50" height="50" margin="0 5 0 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/stroke.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
<button-custom id="btn-pick" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2"> <!--<button id="btn-brush-preset" width="50" height="50" margin="0 0 5 0" text="Preset" thickness="1" border-color=".1" pad="2"/>-->
<image path="data/ui/picker.png" width="100%" height="100%" align="center" justify="flex-end"/> <!--
<button-custom id="btn-brush" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/brushes.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
-->
<button-custom id="btn-color" width="50" height="50" margin="0 5 0 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/palette.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-layer" width="50" height="50" margin="0 5 0 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/layers.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
<button-custom id="btn-erase" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2"> <button-custom id="btn-grids-panel" width="50" height="50" margin="0 5 0 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/eraser.png" width="100%" height="100%" align="center" justify="flex-end"/> <image path="data/ui/grid.png" width="100%" height="100%" align="center" justify="flex-end" mips="true"/>
</button-custom>
<button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>
<button-custom id="btn-line" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/line.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button id="btn-grid" width="40" height="100%" margin="0 0 0 5" text="Grid"/>
<button id="btn-copy" width="40" height="100%" margin="0 0 0 5" text="Copy"/>
<button id="btn-cut" width="40" height="100%" margin="0 0 0 5" text="Cut"/>
<!-- <button id="btn-fill" width="50" height="100%" margin="0 0 0 0" text="Fill"/> -->
<button-custom id="btn-mask-free" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/sel-free.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-mask-line" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/sel-poly.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-bucket" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/bucket.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-touchlock" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/notouch.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
</node> </node>
<button-custom id="btn-undo" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2"> <button-custom id="btn-undo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/undo.png" width="100%" height="100%" align="center" justify="flex-end"/> <image path="data/ui/undo.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
<button-custom id="btn-redo" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2"> <button-custom id="btn-redo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/redo.png" width="100%" height="100%" align="center" justify="flex-end"/> <image path="data/ui/redo.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
<!-- <!--
@@ -1563,34 +1550,48 @@ Here's a list of what's available in this release.
</border> </border>
<!-- central row --> <!-- central row -->
<node grow="1" dir="row" wrap="1" height="0" id="central-row"> <node grow="1" dir="row" wrap="1" height="0" id="central-row">
<border width="60" color=".2 .2 .2 .6" margin="0 0 0 0" dir="col" pad="4" flood-events="1" justify="center" mouse-capture="true"> <border color=".2 .2 .2 .6" pad="0 5 0 0" justify="center" dir="col" flood-events="1" mouse-capture="true">
<!--panel togglers--> <node margin="0 0 50 0" wrap="1" >
<button-custom id="btn-stroke" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2"> <button-custom id="btn-pen" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/stroke.png" width="100%" height="100%" align="center" justify="flex-end"/> <image path="data/ui/pen.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> </button-custom>
<!--<button id="btn-brush-preset" width="50" height="50" margin="0 0 5 0" text="Preset" thickness="1" border-color=".1" pad="2"/>--> <button-custom id="btn-pick" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<!-- <image path="data/ui/picker.png" width="100%" height="100%" align="center" justify="flex-end"/>
<button-custom id="btn-brush" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2"> </button-custom>
<image path="data/ui/brushes.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> <button-custom id="btn-erase" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
--> <image path="data/ui/eraser.png" width="100%" height="100%" align="center" justify="flex-end"/>
<button-custom id="btn-color" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2"> </button-custom>
<image path="data/ui/palette.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom> <button id="btn-cam" width="50" height="50" margin="2 0 2 5" text="Cam"/>
<button-custom id="btn-layer" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/layers.png" width="100%" height="100%" align="center" justify="flex-end"/> <button-custom id="btn-line" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
</button-custom> <image path="data/ui/line.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-grids-panel" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2"> <button id="btn-grid" width="50" height="50" margin="2 0 2 5" text="Grid"/>
<image path="data/ui/grid.png" width="100%" height="100%" align="center" justify="flex-end" mips="true"/> <button id="btn-copy" width="50" height="50" margin="2 0 2 5" text="Copy"/>
</button-custom> <button id="btn-cut" width="50" height="50" margin="2 0 2 5" text="Cut"/>
<!-- <button id="btn-fill" width="50" height="50" margin="0" text="Fill"/> -->
<button-custom id="btn-mask-free" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/sel-free.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-mask-line" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/sel-poly.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-bucket" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/bucket.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
<button-custom id="btn-touchlock" width="50" height="50" margin="2 0 2 5" thickness="1" border-color="0 0 0 1" pad="2">
<image path="data/ui/notouch.png" width="100%" height="100%" align="center" justify="flex-end"/>
</button-custom>
</node>
</border> </border>
<!-- side bar --> <!-- side bar -->
<node height="100%" dir="row" shrink="1"> <node height="100%" dir="row" shrink="1">
<scroll id="panels" pad="5 5 5 5" margin="0 0 0 0" color=".3 .3 .3 .4" height="100%" dir="col" wrap="0" shrink="1"> <scroll id="panels" pad="5 5 5 5" margin="0 0 0 0" color=".3 .3 .3 .4" height="100%" dir="col" wrap="0" shrink="1">
<!--Stroke--> <!--Stroke-->
<panel-stroke id="panel-stroke"/> <!--<panel-stroke id="panel-stroke"/>-->
<!--Brushes--> <!--Brushes-->
<!--<panel-brush id="panel-brush"/>--> <!--<panel-brush id="panel-brush"/>-->
<!--Layers--> <!--Layers-->