Changeset View
Changeset View
Standalone View
Standalone View
input.cpp
Show First 20 Lines • Show All 430 Lines • ▼ Show 20 Line(s) | 430 | } else if (event->angleDelta().y() < 0) { | |||
---|---|---|---|---|---|
431 | direction = PointerAxisDown; | 431 | direction = PointerAxisDown; | ||
432 | } else if (event->angleDelta().y() > 0) { | 432 | } else if (event->angleDelta().y() > 0) { | ||
433 | direction = PointerAxisUp; | 433 | direction = PointerAxisUp; | ||
434 | } | 434 | } | ||
435 | return input()->shortcuts()->processAxis(event->modifiers(), direction); | 435 | return input()->shortcuts()->processAxis(event->modifiers(), direction); | ||
436 | } | 436 | } | ||
437 | bool keyEvent(QKeyEvent *event) override { | 437 | bool keyEvent(QKeyEvent *event) override { | ||
438 | if (event->type() == QEvent::KeyPress) { | 438 | if (event->type() == QEvent::KeyPress) { | ||
439 | return input()->shortcuts()->processKey(event->modifiers(), event->nativeVirtualKey()); | 439 | return input()->shortcuts()->processKey(input()->keyboard()->xkb()->modifiersRelevantForGlobalShortcuts(), event->nativeVirtualKey()); | ||
440 | } | 440 | } | ||
441 | return false; | 441 | return false; | ||
442 | } | 442 | } | ||
443 | }; | 443 | }; | ||
444 | 444 | | |||
445 | class InternalWindowEventFilter : public InputEventFilter { | 445 | class InternalWindowEventFilter : public InputEventFilter { | ||
446 | bool pointerEvent(QMouseEvent *event, quint32 nativeButton) override { | 446 | bool pointerEvent(QMouseEvent *event, quint32 nativeButton) override { | ||
447 | Q_UNUSED(nativeButton) | 447 | Q_UNUSED(nativeButton) | ||
▲ Show 20 Lines • Show All 1159 Lines • Show Last 20 Lines |