edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve layer drag icon drawing

Browse Source
This commit is contained in:
luboslenco
2021-02-12 10:23:45 +01:00
parent 54fb27aff9
commit 08932d8ed5
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+10 -5
View File
@@ -468,8 +468,10 @@ class App {
static function getDragBackground(): TRect {
var icons = Res.get("icons.k");
if (dragLayer != null && dragLayer.getChildren() == null) return Res.tile50(icons, 4, 1);
else return null;
if (dragLayer != null && dragLayer.getChildren() == null && ((dragLayer.fill_layer == null && !Context.layerIsMask) || (dragLayer.fill_mask == null && Context.layerIsMask))) {
return Res.tile50(icons, 4, 1);
}
return null;
}
static function getDragImage(): kha.Image {
@@ -488,7 +490,7 @@ class App {
return dragMaterial.imageIcon;
}
if (dragLayer != null && Context.layerIsMask) {
return dragLayer.texpaint_mask_preview;
return dragLayer.fill_mask != null ? dragLayer.fill_mask.imageIcon : dragLayer.texpaint_mask_preview;
}
if (dragLayer != null && dragLayer.getChildren() != null) {
var icons = Res.get("icons.k");
@@ -504,7 +506,10 @@ class App {
dragTint = UISidebar.inst.ui.t.HIGHLIGHT_COL;
return icons;
}
else return dragLayer.texpaint_preview;
if (dragLayer != null) {
return dragLayer.fill_layer != null ? dragLayer.fill_layer.imageIcon : dragLayer.texpaint_preview;
}
return null;
}
static function render(g: kha.graphics2.Graphics) {
@@ -556,7 +561,7 @@ class App {
#if (kha_direct3d11 || kha_direct3d12 || kha_metal || kha_vulkan)
var inv = 0;
#else
var inv = (dragMaterial != null || dragLayer != null) ? h : 0;
var inv = (dragMaterial != null || (dragLayer != null && ((dragLayer.fill_layer != null && !Context.layerIsMask) || (dragLayer.fill_mask != null && Context.layerIsMask)))) ? h : 0;
#end
g.color = dragTint;
var bgRect = getDragBackground();
Sources/arm/ui/TabLayers.hx
+8
View File
@@ -229,7 +229,15 @@ class TabLayers {
var state = State.Idle;
if (l.fill_mask != null) {
#if kha_opengl
ui.imageInvertY = true;
#end
state = ui.image(l.fill_mask.imageIcon, 0xffffffff, (ui.ELEMENT_H() - 3) * 2);
#if kha_opengl
ui.imageInvertY = false;
#end
}
else {
ui.g.pipeline = UIView2D.pipe;