From e86fcabce72a1b472e64c1a29df9cfd7391c04d6 Mon Sep 17 00:00:00 2001 From: diggit Date: Sun, 26 Aug 2018 11:26:57 +0200 Subject: [PATCH] fix scrollbar dragging behavior, similar to #688 --- nuklear.h | 4 +++- src/nuklear_scrollbar.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nuklear.h b/nuklear.h index c76b033..43a51ad 100644 --- a/nuklear.h +++ b/nuklear.h @@ -21180,6 +21180,7 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, { nk_flags ws = 0; int left_mouse_down; + int left_mouse_clicked; int left_mouse_click_in_cursor; float scroll_delta; @@ -21187,13 +21188,14 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, if (!in) return scroll_offset; left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down; + left_mouse_clicked = in->mouse.buttons[NK_BUTTON_LEFT].clicked; left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in, NK_BUTTON_LEFT, *cursor, nk_true); if (nk_input_is_mouse_hovering_rect(in, *scroll)) *state = NK_WIDGET_STATE_HOVERED; scroll_delta = (o == NK_VERTICAL) ? in->mouse.scroll_delta.y: in->mouse.scroll_delta.x; - if (left_mouse_down && left_mouse_click_in_cursor) { + if (left_mouse_down && left_mouse_click_in_cursor && !left_mouse_clicked) { /* update cursor by mouse dragging */ float pixel, delta; *state = NK_WIDGET_STATE_ACTIVE; diff --git a/src/nuklear_scrollbar.c b/src/nuklear_scrollbar.c index 3a7f179..aad175d 100644 --- a/src/nuklear_scrollbar.c +++ b/src/nuklear_scrollbar.c @@ -15,6 +15,7 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, { nk_flags ws = 0; int left_mouse_down; + int left_mouse_clicked; int left_mouse_click_in_cursor; float scroll_delta; @@ -22,13 +23,14 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, if (!in) return scroll_offset; left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down; + left_mouse_clicked = in->mouse.buttons[NK_BUTTON_LEFT].clicked; left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in, NK_BUTTON_LEFT, *cursor, nk_true); if (nk_input_is_mouse_hovering_rect(in, *scroll)) *state = NK_WIDGET_STATE_HOVERED; scroll_delta = (o == NK_VERTICAL) ? in->mouse.scroll_delta.y: in->mouse.scroll_delta.x; - if (left_mouse_down && left_mouse_click_in_cursor) { + if (left_mouse_down && left_mouse_click_in_cursor && !left_mouse_clicked) { /* update cursor by mouse dragging */ float pixel, delta; *state = NK_WIDGET_STATE_ACTIVE;