From 2aa5708bc725cb48a0d6629dc97bad2fd8cad414 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Fri, 11 Aug 2023 00:39:28 +0100 Subject: [PATCH] Rectangles: use new move_cursor() features --- rect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rect.c b/rect.c index 7228837..89f3a02 100644 --- a/rect.c +++ b/rect.c @@ -2415,11 +2415,11 @@ static char *interpret_move(const game_state *from, game_ui *ui, enddrag = true; erasing = (button == RIGHT_RELEASE); } else if (IS_CURSOR_MOVE(button)) { - move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, false, - NULL); - ui->cur_visible = true; + char *ret; + ret = move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, + false, &ui->cur_visible); active = true; - if (!ui->cur_dragging) return MOVE_UI_UPDATE; + if (!ui->cur_dragging || ret != MOVE_UI_UPDATE) return ret; coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc); } else if (IS_CURSOR_SELECT(button)) { if (ui->drag_start_x >= 0 && !ui->cur_dragging) {