diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-11-16 19:37:33 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-17 11:35:54 +0000 |
| commit | a825fb5f714fd79d16cc3ebbdd327e7961b07d0a (patch) | |
| tree | c6004204986e681c0fa0822b1eb4ce45009d5fda | |
| parent | e5c272423d1bba2825086b82fd97499237a6fa4b (diff) | |
| download | qtwayland-a825fb5f714fd79d16cc3ebbdd327e7961b07d0a.tar.gz | |
Make setting QT_SCALE_FACTOR work on Wayland
Follow-up to 8cb1b07aea12d50b4fecc45c903705dfd368022a,
fixes one additional case (Use of minimum/maximum size).
Fixes: QTBUG-87762
Change-Id: I73e0df2529b0cadf25ad50ea7459cdbb92caf424
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 6ed363e3665f17d935f8636d9c958154c898f5c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index bc031ed5..eb053406 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -332,9 +332,11 @@ void QWaylandWindow::setWindowIcon(const QIcon &icon) void QWaylandWindow::setGeometry_helper(const QRect &rect) { + QSize minimum = windowMinimumSize(); + QSize maximum = windowMaximumSize(); QPlatformWindow::setGeometry(QRect(rect.x(), rect.y(), - qBound(window()->minimumWidth(), rect.width(), window()->maximumWidth()), - qBound(window()->minimumHeight(), rect.height(), window()->maximumHeight()))); + qBound(minimum.width(), rect.width(), maximum.width()), + qBound(minimum.height(), rect.height(), maximum.height()))); if (mSubSurfaceWindow) { QMargins m = QPlatformWindow::parent()->frameMargins(); |