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

add panels docking

Browse Source
This commit is contained in:
omigamedev
2019-03-29 09:32:35 +01:00
parent 15db5c233b
commit 3964c4ea26
11 changed files with 396 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
data/layout.xml
View File

@@ -62,7 +62,7 @@
<layout id="tpl-panel-brush-preset">
<node rtl="ltr" min-width="315">
<scroll id="brushes" color=".4" pad="5 20 5 5" dir="col" wrap="0" flood-events="1" grow="1" height="1"/>
<border height="40" color=".5" dir="row" align="center" flood-events="1">
<border id="toolbar" height="40" color=".5" dir="row" align="center" flood-events="1">
<button-custom id="btn-add" thickness="1" color="0 0" border-color=".0" shrink="1" margin="0 2 0 5">
<icon width="30" icon="add"/>
</button-custom>
@@ -124,11 +124,11 @@
<!-- PANEL COLOR PICKER -->
<layout id="tpl-panel-color">
<node width="350" height="350" margin="0 0 10 0" rtl="ltr">
<node min-width="100" height="100" margin="0 0 10 0" rtl="ltr">
<border id="title" height="30" color=".4" align="center" justify="center">
<text text="Colors" color="1 1 1 1"/>
</border>
<border color=".4" pad="5" dir="row">
<border color=".4" pad="5" dir="row" height="10" grow="1">
<color-quad id="quad" color="1 0 0 1" height="100%" grow="1"/>
<node width="30" dir="col" pad="0 0 0 5"><slider-hue id="hue"/></node>
</border>
@@ -808,14 +808,14 @@
<!-- PANEL COLOR PICKER EXTENDED -->
<layout id="color-picker">
<border positioning="absolute" position="0 0">
<border>
<!--<border width="300" height="30" color=".2 .2 .2 .9" dir="row" align="center">
<node grow="1" width="10" align="center">
<text id="title" text="Color Picker"/>
</node>
--><!--<combobox justify="flex-end" pad="5" margin="0 5 0 0" text="Triangle" combo-list="Triangle,Square" default="0"/>--><!--
</border>-->
<border width="300" color=".4" pad="10" dir="col">
<border width="100%" color=".4" pad="10" dir="col">
<colorwheel id="wheel" width="100%" aspect-ratio="1"/>
<border color=".3" pad="5" dir="row" margin="10 0 0 0">
<border id="color-cur" height="30" grow="1" color="1"/>
@@ -1275,13 +1275,19 @@ Here's a list of what's available in this release.
<layout id="tpl-panel-floating">
<border thickness="1" border-color=".2" pad="3" max-width="650" dir="col" mouse-capture="true">
<border height="30" pad="0 0 0 0" color=".4" align="center" justify="center" dir="row">
<button id="button-close" width="30" height="20" text="X" margin="0 0 0 5"/>
<button id="button-minimize" width="30" height="20" text="--" margin="0 0 0 5"/>
<node align="center" pad="0 30 0 30" justify="center" height="100%" grow="1">
<text text="Floating Panel"/>
</node>
</border>
<border id="container" height="400" color="0 0 0 .9" dir="col">
</border>
<border id="container" color="0 0 0 .9" dir="col" height="10" grow="1"/>
<node dir="row">
<node height="16" grow="1" align="center">
<image path="data/ui/resize-handle-vert.png" width="32" height="16" />
</node>
<image path="data/ui/resize-handle.png" width="16" height="16" />
</node>
</border>
</layout>
@@ -1472,6 +1478,14 @@ Here's a list of what's available in this release.
<icon icon="resultset_next" width="20"/>
</button-custom>
</node>
<node dir="row">
<button-custom id="experimental-panels" height="40" align="center" color=".2" pad="0 0 0 10" dir="row" grow="1">
<text text="Panels" grow="1" margin="0 0 0 5"/>
</button-custom>
<button-custom id="experimental-panels-tick" height="40" width="40" align="center" justify="center" color=".2" dir="row">
<icon icon="resultset_next" width="20"/>
</button-custom>
</node>
<button-custom id="experimental-rtl" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<checkbox id="experimental-rtl-check" width="20" height="20"/>
<text text="Left-handed UI" margin="0 0 0 5"/>
@@ -1483,7 +1497,7 @@ Here's a list of what's available in this release.
</popup-menu>
</layout>
<!-- MENU TIMELAPSE -->
<!-- MENU EXPERIMENTAL > TIMELAPSE -->
<layout id="timelapse-menu">
<popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button-custom id="timelapse-start" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
@@ -1501,6 +1515,36 @@ Here's a list of what's available in this release.
</popup-menu>
</layout>
<!-- MENU EXPERIMENTAL > PANELS -->
<layout id="panels-menu">
<popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
<button-custom id="panel-presets" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Presets" margin="0 0 0 5"/>
</button-custom>
<button-custom id="panel-color" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Color Picker" margin="0 0 0 5"/>
</button-custom>
<button-custom id="panel-color-adv" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Color Panel" margin="0 0 0 5"/>
</button-custom>
<button-custom id="panel-layers" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Layers" margin="0 0 0 5"/>
</button-custom>
<button-custom id="panel-brush" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Brush Settings" margin="0 0 0 5"/>
</button-custom>
<button-custom id="panel-grids" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="camera" width="20"/>
<text text="Grids" margin="0 0 0 5"/>
</button-custom>
</popup-menu>
</layout>
<!-- MENU ABOUT -->
<layout id="about-menu">
<popup-menu positioning="absolute" position="100 100" width="200" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
@@ -1691,6 +1735,8 @@ Here's a list of what's available in this release.
</node>
</border>
<border id="drop-left" color="0 0 0 .6" min-width="10" mouse-capture="true"/>
<!--quick bar-->
<node justify="center" align="center" dir="col">
@@ -1698,6 +1744,10 @@ Here's a list of what's available in this release.
<node height="0" grow="1" max-height="50"/>
</node>
<node id="floatings" color="0 0 0 1" width="1" grow="1" height="100%"/>
<border id="drop-right" color="0 0 0 .6" min-width="10" mouse-capture="true"/>
<!-- timeline -->
<!--
<node height="100%" width="1" grow="1" dir="col" justify="flex-start" rtl="ltr">

2
data/shaders/stroke-preview.glsl
View File

@@ -38,7 +38,7 @@ void main()
if (textureOffset(tex, uv, ivec2(+1, 0)).r > 0.99) zero_count++;
if (textureOffset(tex, uv, ivec2(+1, +1)).r > 0.99) zero_count++;
mediump float edge = (zero_count > 1 && zero_count < 9) ? 0.75 : 0.0;
frag = vec4(col.rgb, edge * (1.0 - float(zero_count) / 9.f));
frag = vec4(col.rgb, edge * (1.0 - float(zero_count) / 9.0));
}
else
{

BIN
data/ui/resize-handle-vert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
data/ui/resize-handle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 843 B