summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-03-29 11:33:34 +0300
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-04-08 11:41:46 +0000
commitedd339d2b38e504a1e288bbd1cf352d1ae009247 (patch)
treeb55fbc48388382f9dec16ecdeb2665839be22aaa
parenta14699030735159f036930069af4df3a61abb163 (diff)
Don't handle mouse events in decos if buttons were pressed in the content area
This fixes the decorations stealing the mouse events when going outside the content area. Change-Id: I8f3592fbda6b9c1da6498d74820a73be11c6999d Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-rw-r--r--src/client/qwaylandwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 1b939726f..ca0fa5139 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -619,7 +619,8 @@ bool QWaylandWindow::touchDragDecoration(QWaylandInputDevice *inputDevice, const
void QWaylandWindow::handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, ulong timestamp, const QPointF &local, const QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
{
- if (mWindowDecoration->handleMouse(inputDevice,local,global,b,mods))
+ if (mMousePressedInContentArea == Qt::NoButton &&
+ mWindowDecoration->handleMouse(inputDevice,local,global,b,mods))
return;
QMargins marg = frameMargins();