android recursive mutex fix, android file path resolver fix

This commit is contained in:
2019-01-28 00:27:56 +01:00
parent 99c06803ae
commit 53fd2d60b5
6 changed files with 617 additions and 17 deletions

View File

@@ -88,6 +88,7 @@
<!--brush-presets panel-->
<layout id="tpl-panel-brush-preset">
<node width="220" margin="0 0 10 0" rtl="ltr">
<scroll id="brushes" color=".4" pad="5 20 5 5" dir="row" wrap="1" flood-events="1" grow="1" height="1"/>
<border 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"/>
@@ -106,7 +107,6 @@
<icon width="30" icon="bin_closed"/>
</button-custom>
</border>
<scroll id="brushes" color=".4" pad="5 20 5 5" dir="row" wrap="1" flood-events="1" grow="1" height="1"/>
</node>
</layout>
<!--brush-presets-item icon-->
@@ -168,13 +168,13 @@
<node height="20" justify="center"><text text="Size" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Flow" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Opacity" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Spacing" font-face="arial" font-size="11"/></node>
<node height="20" justify="center" margin="5 0 0 0"><text text="Spacing" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Angle" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Mixer" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Stencil" font-face="arial" font-size="11"/></node>
<node height="30" justify="center" margin="5 0 0 0"><text text="Stencil" font-face="arial" font-size="11"/></node>
<node height="20" justify="center" margin="5 0 0 0"><text text="Mixer" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Wet" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Noise" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Hue" font-face="arial" font-size="11"/></node>
<node height="20" justify="center" margin="5 0 0 0"><text text="Hue" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Sat" font-face="arial" font-size="11"/></node>
<node height="20" justify="center"><text text="Val" font-face="arial" font-size="11"/></node>
</node>
@@ -200,23 +200,23 @@
</node>
</node>
<node height="20" pad="1" width="100%"><slider-h id="tip-opacity" value="1"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-spacing" value=".25"/></node>
<node height="20" pad="1" width="100%" margin="5 0 0 0"><slider-h id="tip-spacing" value=".25"/></node>
<node height="20" pad="1" width="100%" dir="row">
<slider-h id="tip-angle" width="1" grow="1"/>
<node width="20" pad="0" margin="0 0 0 2">
<checkbox id="tip-angle-follow"></checkbox>
</node>
</node>
<node height="20" pad="1" width="100%"><slider-h id="tip-mix"/></node>
<node height="20" pad="1" width="100%" dir="row">
<node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
<slider-h id="tip-stencil" width="1" grow="1"/>
<node width="20" pad="0" margin="0 0 0 2">
<button id="tip-stencil-load" text="..." height="20"></button>
<node width="50" pad="0" margin="0 0 0 5">
<button id="tip-stencil-load" text="Load" height="30"></button>
</node>
</node>
<node height="20" pad="1" width="100%" margin="5 0 0 0"><slider-h id="tip-mix"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-wet"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-noise"/></node>
<node height="20" pad="1" width="100%" dir="row">
<node height="20" pad="1" width="100%" dir="row" margin="5 0 0 0">
<slider-h id="tip-hue" width="1" grow="1"/>
<node width="20" pad="0" margin="0 0 0 2">
<checkbox id="tip-hue-pressure"></checkbox>