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

Cleanup

Browse Source
This commit is contained in:
luboslenco
2024-01-21 19:02:28 +01:00
parent b97b44d8cf
commit cc6e8088e7
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/Sources/Base.ts
+11 -11
View File
@@ -236,18 +236,18 @@ class Base {
///if (is_paint || is_sculpt) ///if (is_paint || is_sculpt)
static w = (): i32 => { static w = (): i32 => {
// Drawing material preview // Drawing material preview
if (UIBase != null && Context.raw.materialPreview) { if (Context.raw.materialPreview) {
return UtilRender.materialPreviewSize; return UtilRender.materialPreviewSize;
} }
// Drawing decal preview // Drawing decal preview
if (UIBase != null && Context.raw.decalPreview) { if (Context.raw.decalPreview) {
return UtilRender.decalPreviewSize; return UtilRender.decalPreviewSize;
} }
let res = 0; let res = 0;
if (UINodes == null || UIBase == null) { if (Config.raw.layout == null) {
let sidebarw = Config.raw.layout == null ? UIBase.defaultSidebarW : Config.raw.layout[LayoutSize.LayoutSidebarW]; let sidebarw = UIBase.defaultSidebarW;
res = System.width - sidebarw - UIToolbar.defaultToolbarW; res = System.width - sidebarw - UIToolbar.defaultToolbarW;
} }
else if (UINodes.show || UIView2D.show) { else if (UINodes.show || UIView2D.show) {
@@ -259,7 +259,7 @@ class Base {
else { // Distract free else { // Distract free
res = System.width; res = System.width;
} }
if (UIBase != null && Context.raw.viewIndex > -1) { if (Context.raw.viewIndex > -1) {
res = Math.floor(res / 2); res = Math.floor(res / 2);
} }
if (Context.raw.paint2dView) { if (Context.raw.paint2dView) {
@@ -271,18 +271,18 @@ class Base {
static h = (): i32 => { static h = (): i32 => {
// Drawing material preview // Drawing material preview
if (UIBase != null && Context.raw.materialPreview) { if (Context.raw.materialPreview) {
return UtilRender.materialPreviewSize; return UtilRender.materialPreviewSize;
} }
// Drawing decal preview // Drawing decal preview
if (UIBase != null && Context.raw.decalPreview) { if (Context.raw.decalPreview) {
return UtilRender.decalPreviewSize; return UtilRender.decalPreviewSize;
} }
let res = System.height; let res = System.height;
if (UIBase == null) { if (Config.raw.layout == null) {
res -= UIHeader.defaultHeaderH * 2 + UIStatus.defaultStatusH; res -= UIHeader.defaultHeaderH * 2 + UIStatus.defaultStatusH;
///if (krom_android || krom_ios) ///if (krom_android || krom_ios)
@@ -294,7 +294,7 @@ class Base {
res += UIHeader.headerh; res += UIHeader.headerh;
} }
} }
else if (UIBase != null && UIBase.show && res > 0) { else if (UIBase.show && res > 0) {
let statush = Config.raw.layout[LayoutSize.LayoutStatusH]; let statush = Config.raw.layout[LayoutSize.LayoutStatusH];
res -= Math.floor(UIHeader.defaultHeaderH * 2 * Config.raw.window_scale) + statush; res -= Math.floor(UIHeader.defaultHeaderH * 2 * Config.raw.window_scale) + statush;
@@ -328,7 +328,7 @@ class Base {
if (UIBase == null) { if (UIBase == null) {
res -= UIHeader.defaultHeaderH * 2 + UIStatus.defaultStatusH; res -= UIHeader.defaultHeaderH * 2 + UIStatus.defaultStatusH;
} }
else if (UIBase != null && res > 0) { else if (res > 0) {
let statush = Config.raw.layout[LayoutSize.LayoutStatusH]; let statush = Config.raw.layout[LayoutSize.LayoutStatusH];
res -= Math.floor(UIHeader.defaultHeaderH * 2 * Config.raw.window_scale) + statush; res -= Math.floor(UIHeader.defaultHeaderH * 2 * Config.raw.window_scale) + statush;
} }
@@ -892,7 +892,7 @@ class Base {
static redrawConsole = () => { static redrawConsole = () => {
let statush = Config.raw.layout[LayoutSize.LayoutStatusH]; let statush = Config.raw.layout[LayoutSize.LayoutStatusH];
if (UIBase != null && UIBase.ui != null && statush > UIStatus.defaultStatusH * UIBase.ui.SCALE()) { if (UIBase.ui != null && statush > UIStatus.defaultStatusH * UIBase.ui.SCALE()) {
UIBase.hwnds[TabArea.TabStatus].redraws = 2; UIBase.hwnds[TabArea.TabStatus].redraws = 2;
} }
} }