From 5e7d236b00ff0b1960063a7abdbd0586eb523b35 Mon Sep 17 00:00:00 2001 From: MathemanFlo Date: Thu, 18 Sep 2025 09:17:23 +0200 Subject: [PATCH] Improve tooltips if no shortcut is assigned --- paint/sources/ui_toolbar.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/paint/sources/ui_toolbar.ts b/paint/sources/ui_toolbar.ts index 5a386698..63c2110c 100644 --- a/paint/sources/ui_toolbar.ts +++ b/paint/sources/ui_toolbar.ts @@ -61,7 +61,13 @@ function ui_toolbar_draw_tool(i: i32, img: gpu_texture_t, icon_accent: i32, keys } if (ui.is_hovered) { - ui_tooltip(tr(ui_toolbar_tool_names[i]) + " " + keys[i]); + let key: string = keys[i]; + if (key.length > 0) { + ui_tooltip(tr(ui_toolbar_tool_names[i]) + " " + key); + } + else { + ui_tooltip(tr(ui_toolbar_tool_names[i])); + } } ui._x -= 2; ui._y += 2; @@ -203,6 +209,16 @@ function ui_toolbar_render_ui() { key_tool_material ]; + // Erase the () in case no shortcut is assigned + for(let i: i32 = 0; i < keys.length; ++i) { + let key: string = keys[i]; + if(key.length == 2) + keys[i] = ""; + else if(char_at(key,1) == ")") { + keys[i] = substring(key,5,key.length); + } + } + ui_toolbar_ext_draw_tools(img, icon_accent, keys); ui.image_scroll_align = true;