diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch')
-rw-r--r-- | kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch new file mode 100644 index 000000000000..b49006bcde99 --- /dev/null +++ b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch @@ -0,0 +1,52 @@ +From 2e9f96847432c707a9dfbfe0748f0524a128abb7 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Sat, 14 Dec 2019 14:03:30 +0100 +Subject: Resize file dialog window before size restore + +Summary: +KDEPlatformDialogHelper explicitly resizes the window contents to the +window as part of a bug fix. This means we lose the common path where +the window resizes to the content's size hints that happens later. + +If we resize the window to the size hint in advance we keep our size +hint. + +(alternatively it seems to be me we can remove that old hack...but it +needs testing by people with Qt5.12) + +Test Plan: +KWrite -> open + +Size is 900x600, the size hint +not 640x480 the QPA default + +Reviewers: #plasma, ngraham + +Reviewed By: ngraham + +Subscribers: ngraham, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D25986 +--- + src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp +index efb7b60..4c67547 100644 +--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp ++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp +@@ -370,6 +370,10 @@ void KDEPlatformFileDialogHelper::restoreSize() + { + m_dialog->winId(); // ensure there's a window created + KSharedConfig::Ptr conf = KSharedConfig::openConfig(); ++ ++ // see the note below ++ m_dialog->windowHandle()->resize(m_dialog->sizeHint()); ++ + KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize")); + // NOTICE: QWindow::setGeometry() does NOT impact the backing QWidget geometry even if the platform + // window was created -> QTBUG-40584. We therefore copy the size here. +-- +cgit v1.1 |