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

Fix scroll direction on window wheel command

Browse source 
Experimental testing in real world showed it's just a signing issue
in this specific case. The events passed to wayland clients scroll
in correct direction.
This commit is contained in:
Martin Gräßlin 2016-02-18 10:11:20 +01:00
parent e6e11f7853
commit 6d47839e95
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autotests/wayland/pointer_input.cpp
View file

@ -456,9 +456,9 @@ void PointerInputTest::testModifierScrollOpacity()
quint32 timestamp = 1; quint32 timestamp = 1;
QFETCH(int, modifierKey); QFETCH(int, modifierKey);
waylandServer()->backend()->keyboardKeyPressed(modifierKey, timestamp++); waylandServer()->backend()->keyboardKeyPressed(modifierKey, timestamp++);
waylandServer()->backend()->pointerAxisVertical(5, timestamp++);
QCOMPARE(window->opacity(), 0.6);
waylandServer()->backend()->pointerAxisVertical(-5, timestamp++); waylandServer()->backend()->pointerAxisVertical(-5, timestamp++);
QCOMPARE(window->opacity(), 0.6);
waylandServer()->backend()->pointerAxisVertical(5, timestamp++);
QCOMPARE(window->opacity(), 0.5); QCOMPARE(window->opacity(), 0.5);
waylandServer()->backend()->keyboardKeyReleased(modifierKey, timestamp++); waylandServer()->backend()->keyboardKeyReleased(modifierKey, timestamp++);

2
input.cpp
View file

@ -554,7 +554,7 @@ public:
Options::MouseCommand command = Options::MouseNothing; Options::MouseCommand command = Options::MouseNothing;
if (event->modifiers() == options->commandAllModifier()) { if (event->modifiers() == options->commandAllModifier()) {
wasAction = true; wasAction = true;
command = options->operationWindowMouseWheel(event->angleDelta().y()); command = options->operationWindowMouseWheel(-1 * event->angleDelta().y());
} else { } else {
command = c->getWheelCommand(Qt::Vertical, &wasAction); command = c->getWheelCommand(Qt::Vertical, &wasAction);
} }