Cleanup

base/sources/ts/iron/iron.ts

@@ -959,7 +959,7 @@ declare function UI_ELEMENT_W(): f32;
 declare function UI_ELEMENT_H(): f32;
 declare function UI_OUTPUTS_H(sockets_count: i32, length: i32 = -1): f32;
 
-function ui_MENUBAR_H(): f32 {
+function ui_MENUBAR_H(ui: ui_t): f32 {
 	let button_offset_y: f32 = (ui.ops.theme.ELEMENT_H * UI_SCALE() - ui.ops.theme.BUTTON_H * UI_SCALE()) / 2;
 	return ui.ops.theme.BUTTON_H * UI_SCALE() * 1.1 + 2 + button_offset_y;
 }
@@ -1031,7 +1031,7 @@ function ui_get_socket(nodes: ui_node_t[], id: i32): ui_node_socket_t {
 	return null;
 }
 
-function ui_set_font(font: draw_font_t) {
+function ui_set_font(ui: ui_t, font: draw_font_t) {
 	draw_font_init(font); // Make sure font is ready
 	ui.ops.font = font;
 }

base/sources/ts/tab_console.ts

@@ -56,13 +56,13 @@ function tab_console_draw(htab: ui_handle_t) {
 		let _font: draw_font_t = ui.ops.font;
 		let _font_size: i32 = ui.font_size;
 		let f: draw_font_t = data_get_font("font_mono.ttf");
-		ui_set_font(f);
+		ui_set_font(ui, f);
 		ui.font_size = math_floor(15 * UI_SCALE());
 		for (let i: i32 = 0; i < console_last_traces.length; ++i) {
 			let t: string = console_last_traces[i];
 			ui_text(t);
 		}
-		ui_set_font(_font);
+		ui_set_font(ui, _font);
 		ui.font_size = _font_size;
 	}
 }

base/sources/ts/tab_meshes.ts

@@ -330,12 +330,12 @@ function tab_meshes_draw(htab: ui_handle_t) {
 					let _font: draw_font_t = ui.ops.font;
 					let _font_size: i32 = ui.font_size;
 					let fmono: draw_font_t = data_get_font("font_mono.ttf");
-					ui_set_font(fmono);
+					ui_set_font(ui, fmono);
 					ui.font_size = math_floor(15 * UI_SCALE());
 					ui_text_area_coloring = tab_scripts_get_text_coloring();
 					ui_text_area(hscript);
 					ui_text_area_coloring = null;
-					ui_set_font(_font);
+					ui_set_font(ui, _font);
 					ui.font_size = _font_size;
 
 					script = hscript.text;

base/sources/ts/tab_scripts.ts

@@ -53,7 +53,7 @@ function tab_scripts_draw(htab: ui_handle_t) {
 		let _font: draw_font_t = ui.ops.font;
 		let _font_size: i32 = ui.font_size;
 		let f: draw_font_t = data_get_font("font_mono.ttf");
-		ui_set_font(f);
+		ui_set_font(ui, f);
 		ui.font_size = math_floor(15 * UI_SCALE());
 		ui_text_area_line_numbers = true;
 		ui_text_area_scroll_past_end = true;
@@ -62,7 +62,7 @@ function tab_scripts_draw(htab: ui_handle_t) {
 		ui_text_area_line_numbers = false;
 		ui_text_area_scroll_past_end = false;
 		ui_text_area_coloring = null;
-		ui_set_font(_font);
+		ui_set_font(ui, _font);
 		ui.font_size = _font_size;
 	}
 }

base/sources/ts/translator.ts

@@ -167,7 +167,7 @@ function translator_init_font(cjk: bool, font_path: string, font_scale: f32) {
 		base_theme.FONT_SIZE = math_floor(base_default_font_size * font_scale);
 		base_theme.ELEMENT_W = math_floor(base_default_element_w * (config_raw.locale != "en" ? 1.4 : 1.0));
 
-		ui_set_font(f);
+		ui_set_font(ui, f);
 		ui_set_scale(UI_SCALE());
 	});
 }

base/sources/ts/ui_menubar.ts

@@ -728,7 +728,7 @@ function ui_menubar_show_menu(category: i32) {
 	let panel_x: i32 = ui_menu_panel_x();
 	let panel_y: i32 = ui_menu_panel_y();
 	ui_menu_x = math_floor(ui._x - ui._w) + panel_x;
-	ui_menu_y = math_floor(ui_MENUBAR_H()) + panel_y;
+	ui_menu_y = math_floor(ui_MENUBAR_H(ui)) + panel_y;
 	if (config_raw.touch_ui) {
 		let menu_w: i32 = math_floor(base_default_element_w * UI_SCALE() * 2.0);
 		ui_menu_x -= math_floor((menu_w - ui._w) / 2) + math_floor(ui_header_h / 2);