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

Fix color popup scale and offset

Browse Source
This commit is contained in:
luboslenco
2021-02-12 18:35:25 +01:00
parent ca0fac6091
commit c5756140f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/BoxPreferences.hx
+2 -2
View File
@@ -177,7 +177,7 @@ class BoxPreferences {
ui.text("", 0, h.color);
if (ui.isHovered && ui.inputReleased) {
UIMenu.draw(function(ui) {
ui.fill(0, 0, ui._w / ui.ops.scaleFactor, ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
ui.fill(0, 0, ui._w / ui.SCALE(), ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
ui.changed = false;
zui.Ext.colorWheel(ui, h, false, null, false);
if (ui.changed) UIMenu.keepOpen = true;
@@ -218,7 +218,7 @@ class BoxPreferences {
if (ui.isHovered && ui.inputReleased) {
h.color = untyped theme[key];
UIMenu.draw(function(ui) {
ui.fill(0, 0, ui._w / ui.ops.scaleFactor, ui.t.ELEMENT_H * 6, ui.t.SEPARATOR_COL);
ui.fill(0, 0, ui._w / ui.SCALE(), ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
ui.changed = false;
untyped theme[key] = zui.Ext.colorWheel(ui, h, false, null, false);
if (ui.changed) UIMenu.keepOpen = true;
Sources/arm/ui/TabSwatches.hx
+2 -2
View File
@@ -91,14 +91,14 @@ class TabSwatches {
if (Time.time() - Context.selectTime < 0.25) {
UIMenu.draw(function(ui) {
ui.fill(0, 0, ui._w / ui.ops.scaleFactor, ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
ui.fill(0, 0, ui._w / ui.SCALE(), ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
ui.changed = false;
var h = Id.handle();
h.color = Context.swatch.base;
Context.swatch.base = zui.Ext.colorWheel(ui, h, false, null, false);
if (ui.changed) UIMenu.keepOpen = true;
if (ui.inputReleased) Context.setSwatch(Context.swatch); // Trigger material preview update
}, 3, Std.int(Input.getMouse().x) - 200, Std.int(Input.getMouse().y) - 250);
}, 3, Std.int(Input.getMouse().x - 200 * ui.SCALE()), Std.int(Input.getMouse().y - 250 * ui.SCALE()));
}
Context.selectTime = Time.time();