forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
cfc4805455
@ -669,10 +669,8 @@ processEvents(
|
||||
}
|
||||
|
||||
/* dispatch event to XIM server */
|
||||
if ((XFilterEvent(&xevent, (Window)NULL) == True) && (xevent.type != KeyRelease)) {
|
||||
/* do nothing now, the event is consumed by XIM.
|
||||
* however, KeyRelease event should be processed
|
||||
* here, otherwise modifiers remain activated. */
|
||||
if ((XFilterEvent(&xevent, (Window)NULL) == True)) {
|
||||
/* do nothing now, the event is consumed by XIM. */
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
@ -2557,9 +2557,14 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
|
||||
/* eventstate stores if previous event was a KM_PRESS, in case that
|
||||
* wasn't handled, the KM_RELEASE will become a KM_CLICK */
|
||||
|
||||
if (win && event->val == KM_PRESS) {
|
||||
win->eventstate->check_click = true;
|
||||
win->eventstate->check_drag = true;
|
||||
if (win != NULL) {
|
||||
if (event->val == KM_PRESS) {
|
||||
win->eventstate->check_click = true;
|
||||
win->eventstate->check_drag = true;
|
||||
}
|
||||
else if (event->val == KM_RELEASE) {
|
||||
win->eventstate->check_drag = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (win && win->eventstate->prevtype == event->type) {
|
||||
|
Loading…
Reference in New Issue
Block a user