1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: fix enlargening window position by margins size

Browse Source 
In a7bb7210ac76a397b4aec8d8f32d902dc932d855 it was changed to
sum the current geometry with the margins. This makes Qt thinking
that the window is moving on every configure request and makes the
previous fix (b25af2c7687b5802b48076ba1a885cc986084629) actually no-op

I'm not sure why it was changed as the commit is squashed, but I hope
the intention wasn't to make Qt think the window is endlessly moving
(exactly that happened though)

Pick-to: 6.4 6.3
Change-Id: I7cde12ea5548d59810e2631be2a0085f86d5c4b9
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Ilya Fedin 2022-08-08 03:41:59 +04:00
parent 2653ed9761
commit 0b0788c824
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -412,8 +412,7 @@ void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, cons
int widthWithoutMargins = qMax(sizeWithMargins.width() - (margins.left() + margins.right()), 1);
int heightWithoutMargins = qMax(sizeWithMargins.height() - (margins.top() + margins.bottom()), 1);
QRect geometry(windowGeometry().topLeft() + QPoint(margins.left(), margins.top()),
QSize(widthWithoutMargins, heightWithoutMargins));
QRect geometry(windowGeometry().topLeft(), QSize(widthWithoutMargins, heightWithoutMargins));
mOffset += offset;
mInResizeFromApplyConfigure = true;