move presets panel out of stroke panel, implement brush buttons in quick panel

This commit is contained in:
2019-03-05 17:49:14 +01:00
parent 1f794a6811
commit 1cbe9a4a76
10 changed files with 141 additions and 38 deletions

View File

@@ -11,11 +11,11 @@
<!-- PANEL LAYERS -->
<layout id="tpl-panel-layers">
<node width="300" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center" margin="0 0 0 0">
<border height="30" color=".4" align="center" justify="center" margin="0 0 0 0">
<text text="Layers" color="1 1 1 1"/>
</border>
<border height="35" color=".5" dir="row" align="center" flood-events="1" pad="0 0 5 0">
<border height="35" color=".4" dir="row" align="center" flood-events="1" pad="0 0 5 0">
<checkbox id="alpha-lock" icon="data/ui/check-lock-transparency.png" width="30" margin="0 5 0 5"/>
<combobox id="blend-mode" width="100" height="30" margin="0 5 0 0" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay"/>
<slider-h id="opacity" value="1" grow="1" width="1" margin="0 5 0 0"/>
@@ -125,10 +125,10 @@
<!-- PANEL COLOR PICKER -->
<layout id="tpl-panel-color">
<node width="350" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<border height="30" color=".4" align="center" justify="center">
<text text="Colors" color="1 1 1 1"/>
</border>
<border color=".3" pad="5" dir="row" height="350">
<border color=".4" pad="5" dir="row" height="350">
<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>
@@ -637,10 +637,10 @@
<!-- PANEL GRIDS -->
<layout id="tpl-panel-grid">
<node width="350" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<border height="30" color=".4" align="center" justify="center">
<text text="Grids" color="1 1 1 1"/>
</border>
<border color=".3" pad="5" dir="col" width="100%">
<border color=".4" pad="5" dir="col" width="100%">
<node dir="row" margin="0 0 10 0">
<node width="200" grow="1" margin="0 5 0 0">
@@ -658,7 +658,7 @@
</node>
</node>
<scroll id="scroller" color=".3" scroll-color=".2">
<scroll id="scroller" color=".4" scroll-color=".2">
<node dir="row">
<node width="36%" dir="col">
<node height="20" justify="center">
@@ -1496,9 +1496,15 @@ Here's a list of what's available in this release.
<border color="1 1 1 1" width="60" height="30"/>
</button-custom>
<!--brushes-->
<text text="Brushes" margin="20 0 10 0"/>
<button-custom height="35" pad="4">
<stroke-preview id="quick-brush1" width="60" height="100%"/>
<text text="Brushes" margin="10 0 5 0"/>
<button-custom id="quick-brush1" height="45" pad="4">
<stroke-preview width="60" height="100%"/>
</button-custom>
<button-custom id="quick-brush2" height="45" pad="4" margin="4 0 0 0">
<stroke-preview width="60" height="100%"/>
</button-custom>
<button-custom id="quick-brush3" height="45" pad="4" margin="4 0 0 0">
<stroke-preview width="60" height="100%"/>
</button-custom>
</border>
</layout>