be48647d50
- Add commits from upstream's 5.15 branch: * 0002-Make-setting-QT_SCALE_FACTOR-work-on-Wayland.patch (QTBUG-87762) * 0003-Do-not-try-to-eglMakeCurrent-for-unintended-case.patch (QTBUG-88277) * 0004-Make-setting-QT_SCALE_FACTOR-work-on-Wayland.patch (QTBUG-87762, QTBUG-88064) * 0005-Ensure-that-grabbing-is-performed-in-correct-context.patch (QTBUG-87597) * 0006-Fix-leaked-subsurface-wayland-items.patch (QTBUG-88782) - Add commit from KDE's 5.15 branch: * 0007-Use-qWarning-and-_exit-instead-of-qFatal-for-wayland.patch OBS-URL: https://build.opensuse.org/request/show/883510 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwayland?expand=0&rev=14
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From a825fb5f714fd79d16cc3ebbdd327e7961b07d0a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
|
|
Date: Mon, 16 Nov 2020 19:37:33 +0100
|
|
Subject: [PATCH 2/7] 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>
|
|
---
|
|
src/client/qwaylandwindow.cpp | 6 ++++--
|
|
1 file 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();
|
|
--
|
|
2.25.1
|
|
|