From f1625ccbaf7644d2410274cda852c035968ff2ea Mon Sep 17 00:00:00 2001 From: luboslenco Date: Fri, 12 Jun 2026 18:33:42 +0200 Subject: [PATCH] paint: ui tweaks --- paint/sources/ui/ui_toolbar.c | 3 +++ paint/sources/ui/ui_view2d.c | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/paint/sources/ui/ui_toolbar.c b/paint/sources/ui/ui_toolbar.c index 3d2a6463..d094904c 100644 --- a/paint/sources/ui/ui_toolbar.c +++ b/paint/sources/ui/ui_toolbar.c @@ -63,7 +63,10 @@ void ui_toolbar_draw_tool(i32 tool, gpu_texture_t *img, i32 icon_accent) { visible = g_ui->input_y < statusy; } + g_ui->_x -= 2; ui_state_t image_state = ui_sub_image(img, icon_accent, -1.0, rect->x, rect->y, rect->w, rect->h); + g_ui->_x += 2; + if (image_state == UI_STATE_STARTED && visible) { _ui_toolbar_i = tool; sys_notify_on_next_frame(&ui_toolbar_draw_tool_select_tool, NULL); diff --git a/paint/sources/ui/ui_view2d.c b/paint/sources/ui/ui_view2d.c index ff0fd898..083b548d 100644 --- a/paint/sources/ui/ui_view2d.c +++ b/paint/sources/ui/ui_view2d.c @@ -62,6 +62,13 @@ void ui_view2d_draw_edit() { ui_menu_separator(); + ui_handle_t *h_view2d_grid_snap = ui_handle(__ID__); + h_view2d_grid_snap->b = g_config->view2d_grid_snap; + g_config->view2d_grid_snap = ui_check(h_view2d_grid_snap, tr("Grid Snap"), any_map_get(g_keymap, "grid_snap")); + if (h_view2d_grid_snap->changed) { + ui_menu_keep_open = true; + } + ui_handle_t *h_view2d_grid_show = ui_handle(__ID__); h_view2d_grid_show->b = g_config->view2d_grid_show; g_config->view2d_grid_show = ui_check(h_view2d_grid_show, tr("Show Grid"), ""); @@ -81,13 +88,6 @@ void ui_view2d_draw_edit() { ui_menu_keep_open = true; } - ui_handle_t *h_view2d_grid_snap = ui_handle(__ID__); - h_view2d_grid_snap->b = g_config->view2d_grid_snap; - g_config->view2d_grid_snap = ui_check(h_view2d_grid_snap, tr("Grid Snap"), any_map_get(g_keymap, "grid_snap")); - if (h_view2d_grid_snap->changed) { - ui_menu_keep_open = true; - } - ui_menu_separator(); if (ui_menu_button(tr("Zoom to Fit"), "", ICON_NONE)) {