Cursor cleanup

base/sources/ts/base.ts

@@ -308,7 +308,7 @@ function base_redraw_ui() {
 
 function base_update() {
 	if (mouse_movement_x != 0 || mouse_movement_y != 0) {
-		iron_set_mouse_cursor(0); // Arrow
+		iron_mouse_set_cursor(cursor_t.ARROW);
 	}
 
 	let has_drag: bool = base_drag_asset != null ||
@@ -428,7 +428,7 @@ function base_update() {
 			base_drag_layer = null;
 		}
 
-		iron_set_mouse_cursor(0); // Arrow
+		iron_mouse_set_cursor(cursor_t.ARROW);
 		base_is_dragging = false;
 	}
 	if (context_raw.color_picker_callback != null && (mouse_released() || mouse_released("right"))) {
@@ -556,7 +556,7 @@ function base_render() {
 	context_raw.frame++;
 
 	if (base_is_dragging) {
-		iron_set_mouse_cursor(1); // Hand
+		iron_mouse_set_cursor(cursor_t.HAND);
 		let img: gpu_texture_t = base_get_drag_image();
 		let scale_factor: f32 = UI_SCALE();
 		let size: f32 = (base_drag_size == -1 ? 50 : base_drag_size) * scale_factor;

base/sources/ts/iron/iron.ts

@@ -332,7 +332,7 @@ declare type draw_font_t = {
 };
 
 declare function iron_set_save_and_quit_callback(callback: (save: bool)=>void): void;
-declare function iron_set_mouse_cursor(id: i32): void;
+declare function iron_mouse_set_cursor(id: cursor_t): void;
 declare function iron_delay_idle_sleep(): void;
 declare function iron_open_dialog(filter_list: string, default_path: string, open_multiple: bool): string[];
 declare function iron_save_dialog(filter_list: string, default_path: string): string;
@@ -672,6 +672,14 @@ enum shader_type_t {
 	FRAGMENT,
 }
 
+enum cursor_t {
+	ARROW,
+	HAND,
+	IBEAM,
+	SIZEWE,
+	SIZENS,
+}
+
 declare let ui_nodes_enum_texts: (s: string)=>string[];
 declare let ui_touch_scroll: bool;
 declare let ui_touch_hold : bool;

base/sources/ts/ui_base.ts

@@ -1509,8 +1509,8 @@ function ui_base_on_border_hover(handle: ui_handle_t, side: i32) {
 	}
 
 	side == border_side_t.LEFT || side == border_side_t.RIGHT ?
-		iron_set_mouse_cursor(3) : // Horizontal
-		iron_set_mouse_cursor(4);  // Vertical
+		iron_mouse_set_cursor(cursor_t.SIZEWE) :
+		iron_mouse_set_cursor(cursor_t.SIZENS);
 
 	if (ui.input_started) {
 		ui_base_border_started = side;
@@ -1520,7 +1520,7 @@ function ui_base_on_border_hover(handle: ui_handle_t, side: i32) {
 }
 
 function ui_base_on_text_hover() {
-	iron_set_mouse_cursor(2); // I-cursor
+	iron_mouse_set_cursor(cursor_t.IBEAM);
 }
 
 function ui_base_on_deselect_text() {