sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-06-07 20:41:10 +02:00
commit cfc4805455
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -669,10 +669,8 @@ processEvents(
} }
/* dispatch event to XIM server */ /* dispatch event to XIM server */
if ((XFilterEvent(&xevent, (Window)NULL) == True) && (xevent.type != KeyRelease)) { if ((XFilterEvent(&xevent, (Window)NULL) == True)) {
/* do nothing now, the event is consumed by XIM. /* do nothing now, the event is consumed by XIM. */
* however, KeyRelease event should be processed
* here, otherwise modifiers remain activated. */
continue; continue;
} }
#endif #endif

7
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -2557,10 +2557,15 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
/* eventstate stores if previous event was a KM_PRESS, in case that /* eventstate stores if previous event was a KM_PRESS, in case that
* wasn't handled, the KM_RELEASE will become a KM_CLICK */ * wasn't handled, the KM_RELEASE will become a KM_CLICK */
if (win && event->val == KM_PRESS) { if (win != NULL) {
if (event->val == KM_PRESS) {
win->eventstate->check_click = true; win->eventstate->check_click = true;
win->eventstate->check_drag = true; win->eventstate->check_drag = true;
} }
else if (event->val == KM_RELEASE) {
win->eventstate->check_drag = false;
}
}
if (win && win->eventstate->prevtype == event->type) { if (win && win->eventstate->prevtype == event->type) {