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

Move decoration double click logic to button press

Browse source 
Complements ed1d32288b for Wayland.
This commit is contained in:
Martin Gräßlin 2016-02-17 14:41:26 +01:00
parent cc8b3a5a96
commit 093e56ff05
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
abstract_client.cpp
View file

@ -1445,8 +1445,8 @@ bool AbstractClient::processDecorationButtonPress(QMouseEvent *event, bool ignor
void AbstractClient::processDecorationButtonRelease(QMouseEvent *event) void AbstractClient::processDecorationButtonRelease(QMouseEvent *event)
{ {
if (isDecorated()) { if (isDecorated()) {
if (!event->isAccepted() && decoration()->titleBar().contains(event->pos()) && event->button() == Qt::LeftButton) { if (event->isAccepted() || !decoration()->titleBar().contains(event->pos())) {
m_decoration.doubleClickTimer.start(); invalidateDecorationDoubleClickTimer(); // click was for the deco and shall not init a doubleclick
} }
} }

2
autotests/wayland/decoration_input_test.cpp
View file

@ -283,11 +283,9 @@ void KWin::DecorationInputTest::testDoubleClick()
// double click again // double click again
PRESS; PRESS;
RELEASE; RELEASE;
QEXPECT_FAIL("", "Tripple click triggers another double click", Continue);
QVERIFY(c->isOnAllDesktops()); QVERIFY(c->isOnAllDesktops());
PRESS; PRESS;
RELEASE; RELEASE;
QEXPECT_FAIL("", "Tripple click triggers another double click", Continue);
QVERIFY(!c->isOnAllDesktops()); QVERIFY(!c->isOnAllDesktops());
} }