commit: 47ca37ef5f2f558bf3e9f1a9cfe23d2f144de774 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 17 21:37:12 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 17 23:48:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ca37ef
kde-plasma/plasma-integration: Resize file dialog window before size restore Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ma-integration-5.17.4-fix-filedialog-size.patch | 52 ++++++++++++++++++++++ .../plasma-integration-5.17.4-r1.ebuild | 49 ++++++++++++++++++++ 2 files changed, 101 insertions(+) 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 00000000000..b49006bcde9 --- /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 <[email protected]> +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 diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild new file mode 100644 index 00000000000..c2b808ff6a9 --- /dev/null +++ b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VIRTUALX_REQUIRED="test" +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" +LICENSE="LGPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +DEPEND=" + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[dbus] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libXcursor + x11-libs/libxcb +" +RDEPEND="${DEPEND} + media-fonts/hack + media-fonts/noto +" + +# requires running kde environment +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}"/${P}-fix-filedialog-size.patch )
