yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.6'

Browse source
This commit is contained in:
Martin Gräßlin 2016-03-04 15:46:56 +01:00
commit c6f3fccdab
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
input.cpp
View file

@ -492,7 +492,8 @@ public:
if (!TabBox::TabBox::self() || !TabBox::TabBox::self()->isGrabbed()) { if (!TabBox::TabBox::self() || !TabBox::TabBox::self()->isGrabbed()) {
return false; return false;
} }
TabBox::TabBox::self()->keyPress(event->modifiers() | event->key()); if (event->type() == QEvent::KeyPress)
TabBox::TabBox::self()->keyPress(event->modifiers() | event->key());
return true; return true;
} }
bool wheelEvent(QWheelEvent *event) override { bool wheelEvent(QWheelEvent *event) override {
@ -868,10 +869,10 @@ void InputRedirection::setupInputFilters()
installInputEventFilter(new ScreenEdgeInputFilter); installInputEventFilter(new ScreenEdgeInputFilter);
installInputEventFilter(new EffectsFilter); installInputEventFilter(new EffectsFilter);
installInputEventFilter(new MoveResizeFilter); installInputEventFilter(new MoveResizeFilter);
installInputEventFilter(new GlobalShortcutFilter);
#ifdef KWIN_BUILD_TABBOX #ifdef KWIN_BUILD_TABBOX
installInputEventFilter(new TabBoxInputFilter); installInputEventFilter(new TabBoxInputFilter);
#endif #endif
installInputEventFilter(new GlobalShortcutFilter);
installInputEventFilter(new InternalWindowEventFilter); installInputEventFilter(new InternalWindowEventFilter);
installInputEventFilter(new DecorationEventFilter); installInputEventFilter(new DecorationEventFilter);
if (waylandServer()) { if (waylandServer()) {