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

Fix scroll align

Browse Source
This commit is contained in:
luboslenco
2019-06-07 12:16:37 +02:00
parent c70e3d4224
commit e9aab115c3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/renderpath/RenderPathPaint.hx
+4
View File
@@ -144,6 +144,10 @@ class RenderPathPaint {
// tool != ToolText) {
return;
}
if (!arm.App.uienabled ||
UITrait.inst.worktab.position != 0) {
return;
}
var path = RenderPathDeferred.path;
Sources/arm/ui/UITrait.hx
+2 -2
View File
@@ -1956,9 +1956,10 @@ class UITrait extends iron.Trait {
#end
for (j in 0...5) {
var imgw = ui.SCALE > 1 ? 100 : 50;
var i = j + row * 5;
if (i >= materials.length) {
@:privateAccess ui.endElement();
@:privateAccess ui.endElement(imgw);
continue;
}
var img = ui.SCALE > 1 ? materials[i].image : materials[i].imageIcon;
@@ -1974,7 +1975,6 @@ class UITrait extends iron.Trait {
ui.fill(w + 3, -2, 2, w + 4, ui.t.HIGHLIGHT_COL);
}
var imgw = ui.SCALE > 1 ? 100 : 50;
var uix = ui._x;
var uiy = ui._y;
var state = materialPreviewReady ? ui.image(img) : ui.image(Res.get('icons.png'), -1, null, imgw, imgw, imgw, imgw);