Accepting request 891821 from home:Vogtinator:kxmlgui

- Add patch to fix initial window size of konsole:
  * 0001-Revert-Fix-initial-window-size-calculations.patch

OBS-URL: https://build.opensuse.org/request/show/891821
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kxmlgui?expand=0&rev=246
This commit is contained in:
Luca Beltrame 2021-05-09 12:23:00 +00:00 committed by Git OBS Bridge
parent 1102da4ac8
commit f3e4622074
3 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From 47982fe4ea9e54aa70f19520f697f780429d4fa7 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sun, 9 May 2021 13:23:57 +0200
Subject: [PATCH] Revert "Fix initial window size calculations"
This reverts commit f147fcf22318acf3b953600a028ea026fd7c345b.
It breaks konsole: https://invent.kde.org/frameworks/kxmlgui/-/merge_requests/53#note_237142
---
src/kmainwindow.cpp | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
index 8721de5b..f12141a0 100644
--- a/src/kmainwindow.cpp
+++ b/src/kmainwindow.cpp
@@ -696,12 +696,6 @@ void KMainWindow::applyMainWindowSettings(const KConfigGroup &cg)
if (!d->sizeApplied && (!window() || window() == this)) {
winId(); // ensure there's a window created
- // Set the window's size from the existing widget geometry to respect the
- // implicit size when there is no saved geometry in the config file for
- // KWindowConfig::restoreWindowSize() to restore
- // TODO: remove once QTBUG-40584 is fixed; see below
- windowHandle()->setWidth(width());
- windowHandle()->setHeight(height());
KWindowConfig::restoreWindowSize(windowHandle(), cg);
// 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.
--
2.25.1

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun May 9 11:25:41 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix initial window size of konsole:
* 0001-Revert-Fix-initial-window-size-calculations.patch
-------------------------------------------------------------------
Sat May 1 16:41:19 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -36,6 +36,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE (until fixed properly)
Patch1: 0001-Revert-Fix-initial-window-size-calculations.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem