Merge branch 'Plasma/5.6'
This commit is contained in:
commit
c6f3fccdab
1 changed files with 3 additions and 2 deletions
|
@ -492,6 +492,7 @@ public:
|
|||
if (!TabBox::TabBox::self() || !TabBox::TabBox::self()->isGrabbed()) {
|
||||
return false;
|
||||
}
|
||||
if (event->type() == QEvent::KeyPress)
|
||||
TabBox::TabBox::self()->keyPress(event->modifiers() | event->key());
|
||||
return true;
|
||||
}
|
||||
|
@ -868,10 +869,10 @@ void InputRedirection::setupInputFilters()
|
|||
installInputEventFilter(new ScreenEdgeInputFilter);
|
||||
installInputEventFilter(new EffectsFilter);
|
||||
installInputEventFilter(new MoveResizeFilter);
|
||||
installInputEventFilter(new GlobalShortcutFilter);
|
||||
#ifdef KWIN_BUILD_TABBOX
|
||||
installInputEventFilter(new TabBoxInputFilter);
|
||||
#endif
|
||||
installInputEventFilter(new GlobalShortcutFilter);
|
||||
installInputEventFilter(new InternalWindowEventFilter);
|
||||
installInputEventFilter(new DecorationEventFilter);
|
||||
if (waylandServer()) {
|
||||
|
|
Loading…
Reference in a new issue