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

Fix ui align in distract free mode

Browse Source
This commit is contained in:
Lubos Lenco
2021-04-06 12:14:04 +02:00
parent cb7677df81
commit 5f087ce57e
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/UINodes.hx
+16
View File
@@ -265,6 +265,11 @@ class UINodes {
wy += iron.App.h() - Config.raw.layout[LayoutNodesH];
}
var ww = Config.raw.layout[LayoutNodesW];
if (!UISidebar.inst.show) {
ww += Config.raw.layout[LayoutSidebarW] + UIToolbar.inst.toolbarw;
wx -= UIToolbar.inst.toolbarw;
wy = 0;
}
var mx = mouse.x;
var my = mouse.y;
if (mx < wx || mx > wx + ww || my < wy) return;
@@ -374,6 +379,9 @@ class UINodes {
public function drawGrid() {
var ww = Config.raw.layout[LayoutNodesW];
if (!UISidebar.inst.show) {
ww += Config.raw.layout[LayoutSidebarW] + UIToolbar.inst.toolbarw;
}
var wh = iron.App.h();
var w = ww + 100 * 2;
var h = wh + 100 * 2;
@@ -457,11 +465,19 @@ class UINodes {
ww = Config.raw.layout[LayoutNodesW];
wx = Std.int(iron.App.w()) + UIToolbar.inst.toolbarw;
wy = UIHeader.inst.headerh * 2;
if (!UISidebar.inst.show) {
ww += Config.raw.layout[LayoutSidebarW] + UIToolbar.inst.toolbarw;
wx -= UIToolbar.inst.toolbarw;
wy = 0;
}
var ew = Std.int(ui.ELEMENT_W() * 0.7);
wh = iron.App.h();
if (UIView2D.inst.show) {
wh = Config.raw.layout[LayoutNodesH];
wy = iron.App.h() - Config.raw.layout[LayoutNodesH] + UIHeader.inst.headerh * 2;
if (!UISidebar.inst.show) {
wy -= UIHeader.inst.headerh * 2;
}
}
if (ui.window(hwnd, wx, wy, ww, wh)) {
Sources/arm/ui/UISidebar.hx
+1 -1
View File
@@ -898,7 +898,7 @@ class UISidebar {
Krom.setMouseCursor(3) : // Horizontal
Krom.setMouseCursor(4); // Vertical
if (ui.inputStarted) {
if (Zui.current.inputStarted) {
borderStarted = side;
borderHandle = handle;
App.isResizing = true;
Sources/arm/ui/UIView2D.hx
+5
View File
@@ -64,6 +64,11 @@ class UIView2D {
ww = Config.raw.layout[LayoutNodesW];
wx = Std.int(iron.App.w()) + UIToolbar.inst.toolbarw;
wy = UIHeader.inst.headerh * 2;
if (!UISidebar.inst.show) {
ww += Config.raw.layout[LayoutSidebarW] + UIToolbar.inst.toolbarw;
wx -= UIToolbar.inst.toolbarw;
wy = 0;
}
if (!show) return;
if (System.windowWidth() == 0 || System.windowHeight() == 0) return;