integrate quick panel and new color picker
This commit is contained in:
@@ -758,38 +758,49 @@
|
||||
</border>-->
|
||||
<border width="300" color=".4" pad="10" dir="col">
|
||||
<colorwheel id="wheel" width="100%" aspect-ratio="1"/>
|
||||
<border color="1" pad="5" dir="row" margin="10 0 0 0">
|
||||
<border border-color="0 0 0 1" thickness="1" id="color-cur" height="30" grow="1" color="1"/>
|
||||
<border border-color="0 0 0 1" thickness="1" id="color-old" height="30" grow="1" color="0"/>
|
||||
<border border-color="0 0 0 1" thickness="1" id="color-old1" height="30" grow="1" color="0"/>
|
||||
<border border-color="0 0 0 1" thickness="1" id="color-old2" height="30" grow="1" color="0"/>
|
||||
<border color=".3" pad="5" dir="row" margin="10 0 0 0">
|
||||
<border id="color-cur" height="30" grow="1" color="1"/>
|
||||
<border id="color-old" height="30" grow="1" color="0" margin="0 10 0 0"/>
|
||||
<border id="color-old1" height="30" grow="0.5" color="0" margin="0 2 0 0"/>
|
||||
<border id="color-old2" height="30" grow="0.5" color="0" margin="0 2 0 0"/>
|
||||
<border id="color-old3" height="30" grow="0.5" color="0" margin="0 2 0 0"/>
|
||||
<border id="color-old4" height="30" grow="0.5" color="0"/>
|
||||
</border>
|
||||
<!--HSV-->
|
||||
<border pad="5" color=".3" margin="10 0 0 0">
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="H"/></node>
|
||||
<slider-h id="hsv-h" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="S"/></node>
|
||||
<slider-h id="hsv-s" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="V"/></node>
|
||||
<slider-h id="hsv-v" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
</border>
|
||||
<!--RGB-->
|
||||
<border pad="5" color=".3" margin="10 0 0 0">
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="R"/></node>
|
||||
<slider-h id="rgb-r" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="G"/></node>
|
||||
<slider-h id="rgb-g" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="B"/></node>
|
||||
<slider-h id="rgb-b" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
</border>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center" margin="10 0 0 0">
|
||||
<node width="20"><text text="H"/></node>
|
||||
<slider-h id="hsv-h" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="S"/></node>
|
||||
<slider-h id="hsv-s" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center">
|
||||
<node width="20"><text text="V"/></node>
|
||||
<slider-h id="hsv-v" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
<node width="100%" pad="2" height="20" dir="row" align="center" margin="5 0 0 0">
|
||||
<node width="20"><text text="R"/></node>
|
||||
<slider-h id="rgb-r" width="10" grow="1" value="1"/>
|
||||
<node width="15" margin="0 0 0 5"><text text="G"/></node>
|
||||
<slider-h id="rgb-g" width="10" grow="1" value="1"/>
|
||||
<node width="15" margin="0 0 0 5"><text text="B"/></node>
|
||||
<slider-h id="rgb-b" width="10" grow="1" value="1"/>
|
||||
</node>
|
||||
|
||||
</border>
|
||||
<node height="33" dir="row" align="flex-end" justify="flex-end">
|
||||
<!--<node height="33" dir="row" align="flex-end" justify="flex-end">
|
||||
<button id="btn-ok" text="Reset" width="60" height="30" margin="0 10 0 0"/>
|
||||
<button id="btn-select" text="Select color" width="100" height="30"/>
|
||||
</node>
|
||||
</node>-->
|
||||
</border>
|
||||
</layout>
|
||||
|
||||
@@ -1413,7 +1424,7 @@ Here's a list of what's available in this release.
|
||||
</layout>
|
||||
|
||||
<!-- quick access -->
|
||||
<layout id="panel-quick">
|
||||
<layout id="tpl-panel-quick">
|
||||
<border color="0 0 0 0.3" width="80" dir="col" pad="5" align="center" mouse-capture="true" shrink="1">
|
||||
<node dir="row" pad="5">
|
||||
<!--size-->
|
||||
@@ -1593,7 +1604,7 @@ Here's a list of what's available in this release.
|
||||
|
||||
<!--quick bar-->
|
||||
<node justify="center" align="center">
|
||||
<panel-quick/>
|
||||
<panel-quick id="panel-quick"/>
|
||||
</node>
|
||||
|
||||
<!-- timeline -->
|
||||
|
||||
Reference in New Issue
Block a user