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

Update grid graphic

Browse Source
This commit is contained in:
luboslenco
2019-12-28 15:54:40 +01:00
parent 7e51da6483
commit 45e7d3e589
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/UIBox.hx
+4 -4
View File
@@ -16,7 +16,7 @@ class UIBox {
public static var clickToHide = true;
static var modalW = 400;
static var modalH = 170;
static var drawn = false;
static var draws = 0;
public static function render(g: kha.graphics2.Graphics) {
g.end();
@@ -60,7 +60,7 @@ class UIBox {
}
g.begin(false);
drawn = true;
draws++;
}
public static function update() {
@@ -70,7 +70,7 @@ class UIBox {
var ui = App.uibox;
var inUse = ui.comboSelectedHandle != null;
var isEscape = kb.started("escape");
if (drawn && (ui.inputReleased || isEscape) && !inUse && !ui.isTyping) {
if (draws > 2 && (ui.inputReleased || isEscape) && !inUse && !ui.isTyping) {
var appw = System.windowWidth();
var apph = System.windowHeight();
var mw = Std.int(modalW * ui.SCALE());
@@ -108,7 +108,7 @@ class UIBox {
hwnd.dragX = 0;
hwnd.dragY = 0;
show = true;
drawn = false;
draws = 0;
clickToHide = true;
}
}
Sources/arm/ui/UINodes.hx
+18 -9
View File
@@ -258,20 +258,29 @@ class UINodes {
public function drawGrid() {
var ww = defaultWindowW;
var wh = iron.App.h();
var w = ww + 40 * 2;
var h = wh + 40 * 2;
var w = ww + 100 * 2;
var h = wh + 100 * 2;
if (w < 1) w = 1;
if (h < 1) h = 1;
grid = Image.createRenderTarget(w, h);
grid.g2.begin(true, ui.t.SEPARATOR_COL);
for (i in 0...Std.int(h / 40) + 1) {
grid.g2.color = ui.t.WINDOW_BG_COL;
grid.g2.drawLine(0, i * 40 + 20, w, i * 40 + 20);
grid.g2.color = ui.t.SEPARATOR_COL - 0x00050505;
for (i in 0...Std.int(h / 20) + 1) {
grid.g2.drawLine(0, i * 20, w, i * 20);
}
for (i in 0...Std.int(w / 40) + 1) {
grid.g2.color = ui.t.WINDOW_BG_COL;
grid.g2.drawLine(i * 40 + 20, 0, i * 40 + 20, h);
for (i in 0...Std.int(w / 20) + 1) {
grid.g2.drawLine(i * 20, 0, i * 20, h);
}
grid.g2.color = ui.t.SEPARATOR_COL - 0x00090909;
for (i in 0...Std.int(h / 100) + 1) {
grid.g2.drawLine(0, i * 100, w, i * 100);
}
for (i in 0...Std.int(w / 100) + 1) {
grid.g2.drawLine(i * 100, 0, i * 100, h);
}
grid.g2.end();
}
@@ -319,7 +328,7 @@ class UINodes {
// Grid
var nodes = getNodes();
ui.g.color = 0xffffffff;
ui.g.drawImage(grid, (nodes.panX * nodes.SCALE()) % 40 - 40, (nodes.panY * nodes.SCALE()) % 40 - 40);
ui.g.drawImage(grid, (nodes.panX * nodes.SCALE()) % 100 - 100, (nodes.panY * nodes.SCALE()) % 100 - 100);
// Nodes
var c = getCanvas();