diff options
| author | Rob Hall <robxnanocode@outlook.com> | 2023-12-24 21:46:48 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-06 19:14:09 +0000 |
| commit | 82559fef4413b3c47e9dffcdf59ddd7741b9cb64 (patch) | |
| tree | 1146287b5a68c7e718229348d100ece1218f74ff /src | |
| parent | c4e3876c3ab33dca8761de1b3196b9d89adf506a (diff) | |
client: Fix window margin calculation
Don't subtract the size of the window frame margin from the content
area. Fixes an issue where an area of the window is unclickable when
client-side decorations are in use.
Fixes: QTBUG-120392
Pick-to: 6.5
Change-Id: I6a89b2d463be084233ea3448cacfbbd09d66b96e
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
(cherry picked from commit c37824eeacda237dbc62f0951dfea1fd2eb5ddb2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0618e1e7f73c6bef2e70a2ad51aa9b6f5959cec5)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 202bf1c32..f32a487e6 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -1350,8 +1350,8 @@ void QWaylandWindow::handleMouseEventWithDecoration(QWaylandInputDevice *inputDe QMargins marg = frameMargins(); QRect windowRect(0 + marg.left(), 0 + marg.top(), - geometry().size().width() - marg.right(), - geometry().size().height() - marg.bottom()); + geometry().size().width(), + geometry().size().height()); if (windowRect.contains(e.local.toPoint()) || mMousePressedInContentArea != Qt::NoButton) { const QPointF localTranslated = mapFromWlSurface(e.local); QPointF globalTranslated = e.global; |