Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-10-26 08:08:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-10-26 08:08:45 +0300
commit81f2e68e208215a45d426052d92ed2064c7d017c (patch)
tree25b4ce87e5577a1afe6e41e23d0ca9898ca367c1 /source/blender/windowmanager
parent171c4e982f7b6c93b534a48cfe8aba73dec78030 (diff)
Event System: check_click was left set
Caused by own change 137586a13c
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 6ebe1671afc..a71202bfa71 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2204,19 +2204,24 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
if ((event->val == KM_RELEASE) &&
(win->eventstate->prevval == KM_PRESS) &&
- (win->eventstate->check_click == true) &&
- ((abs(event->x - win->eventstate->prevclickx)) <= WM_EVENT_CLICK_WIGGLE_ROOM &&
- (abs(event->y - win->eventstate->prevclicky)) <= WM_EVENT_CLICK_WIGGLE_ROOM))
+ (win->eventstate->check_click == true))
{
- event->val = KM_CLICK;
-
- if (G.debug & (G_DEBUG_HANDLERS)) {
- printf("%s: handling CLICK\n", __func__);
- }
+ if ((abs(event->x - win->eventstate->prevclickx)) <= WM_EVENT_CLICK_WIGGLE_ROOM &&
+ (abs(event->y - win->eventstate->prevclicky)) <= WM_EVENT_CLICK_WIGGLE_ROOM)
+ {
+ event->val = KM_CLICK;
- action |= wm_handlers_do_intern(C, event, handlers);
+ if (G.debug & (G_DEBUG_HANDLERS)) {
+ printf("%s: handling CLICK\n", __func__);
+ }
- event->val = KM_RELEASE;
+ action |= wm_handlers_do_intern(C, event, handlers);
+
+ event->val = KM_RELEASE;
+ }
+ else {
+ win->eventstate->check_click = 0;
+ }
}
else if (event->val == KM_DBL_CLICK) {
event->val = KM_PRESS;