From bf8e8dd58efb0d94dfb8a18f5eb7c3cbd11d4d23 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Fri, 15 Aug 2025 23:40:53 +0200
Subject: [PATCH] ui cleanup

---
 base/sources/ts/iron/iron.ts | 6 +++---
 base/sources/ts/ui_box.ts    | 2 +-
 base/sources/ts/ui_nodes.ts  | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/base/sources/ts/iron/iron.ts b/base/sources/ts/iron/iron.ts
index 59a7187a..c0ac500d 100644
--- a/base/sources/ts/iron/iron.ts
+++ b/base/sources/ts/iron/iron.ts
@@ -937,14 +937,14 @@ enum ui_state_t {
 	HOVERED,
 }
 
-declare function ui_tooltip_image(image: gpu_texture_t, max_width: i32 = 0);
+declare function ui_tooltip_image(image: gpu_texture_t, max_width: i32 = 0): void;
 declare function ui_image(image: gpu_texture_t, tint: i32 = 0xffffffff, h: f32 = -1.0): ui_state_t;
 declare function ui_sub_image(image: gpu_texture_t, tint: i32 = 0xffffffff, h: f32 = -1.0, sx: i32 = 0, sy: i32 = 0, sw: i32 = 0, sh: i32 = 0): ui_state_t;
 declare function ui_window(handle: ui_handle_t, x: i32, y: i32, w: i32, h: i32, drag: bool = false): bool;
-declare function ui_end();
+declare function ui_end(): void;
 declare function ui_set_scale(factor: f32);
 declare function ui_end_element(): void;
-declare function ui_end_element_of_size(element_size: f32);
+declare function ui_end_element_of_size(element_size: f32): void;
 declare function UI_SCALE(): f32;
 declare function UI_ELEMENT_OFFSET(): f32;
 declare function UI_ELEMENT_W(): f32;
diff --git a/base/sources/ts/ui_box.ts b/base/sources/ts/ui_box.ts
index 51f0fb22..62794259 100644
--- a/base/sources/ts/ui_box.ts
+++ b/base/sources/ts/ui_box.ts
@@ -25,7 +25,7 @@ function ui_box_init() {
 function ui_box_render() {
 	if (!ui_menu_show) {
 		let in_use: bool = ui.combo_selected_handle != null;
-		let is_escape: bool = keyboard_started("escape");
+		let is_escape: bool = ui.is_escape_down;
 		if (ui_box_draws > 2 && (ui.input_released || is_escape) && !in_use && !ui.is_typing) {
 			let appw: i32 = iron_window_width();
 			let apph: i32 = iron_window_height();
diff --git a/base/sources/ts/ui_nodes.ts b/base/sources/ts/ui_nodes.ts
index e109281f..626bdadf 100644
--- a/base/sources/ts/ui_nodes.ts
+++ b/base/sources/ts/ui_nodes.ts
@@ -1240,6 +1240,10 @@ function ui_nodes_render() {
 		if (ui_nodes_group_stack.length > 0 && _ui_menu_button(tr("Close"))) {
 			array_pop(ui_nodes_group_stack);
 		}
+
+		ui.window_border_right = 0;
+		ui.window_border_top = 0;
+		ui.window_border_bottom = 0;
 	}
 
 	ui_end();