Fix layout init

armory3d · Feb 4, 2025 · 2d31680 · 2d31680
1 parent d0eff66
commit 2d31680
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/base/sources/base.ts b/base/sources/base.ts
@@ -753,34 +753,36 @@ function base_init_undo_layers() {
 function base_init_layout() {
 	let raw: config_t = config_raw;
 	let show2d: bool = (ui_nodes_show || ui_view2d_show) && raw.layout != null;
-	raw.layout = [];
+	let new_layout: i32[] = [];
 
-	array_push(raw.layout, math_floor(ui_base_default_sidebar_w * raw.window_scale)); // LayoutSidebarW
-	array_push(raw.layout, math_floor(sys_height() / 2)); // LayoutSidebarH0
-	array_push(raw.layout, math_floor(sys_height() / 2)); // LayoutSidebarH1
+	array_push(new_layout, math_floor(ui_base_default_sidebar_w * raw.window_scale)); // LayoutSidebarW
+	array_push(new_layout, math_floor(sys_height() / 2)); // LayoutSidebarH0
+	array_push(new_layout, math_floor(sys_height() / 2)); // LayoutSidebarH1
 
 	///if arm_ios
-	array_push(raw.layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.473) : math_floor(app_w() * 0.473)); // LayoutNodesW
+	array_push(new_layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.473) : math_floor(app_w() * 0.473)); // LayoutNodesW
 	///elseif arm_android
-	array_push(raw.layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.473) : math_floor(app_w() * 0.473));
+	array_push(new_layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.473) : math_floor(app_w() * 0.473));
 	///else
-	array_push(raw.layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.515) : math_floor(app_w() * 0.515)); // Align with ui header controls
+	array_push(new_layout, show2d ? math_floor((app_w() + raw.layout[layout_size_t.NODES_W]) * 0.515) : math_floor(app_w() * 0.515)); // Align with ui header controls
 	///end
 
-	array_push(raw.layout, math_floor(app_h() / 2)); // LayoutNodesH
-	array_push(raw.layout, math_floor(ui_status_default_status_h * raw.window_scale)); // LayoutStatusH
+	array_push(new_layout, math_floor(app_h() / 2)); // LayoutNodesH
+	array_push(new_layout, math_floor(ui_status_default_status_h * raw.window_scale)); // LayoutStatusH
 
 	///if (arm_android || arm_ios)
-	array_push(raw.layout, 0); // LayoutHeader
+	array_push(new_layout, 0); // LayoutHeader
 	///else
-	array_push(raw.layout, 1);
+	array_push(new_layout, 1);
 	///end
 
 	raw.layout_tabs = [
 		0,
 		0,
 		0
 	];
+
+	raw.layout = new_layout;
 }
 
 function base_init_config() {