forked from pool/libqt5-qtbase
Accepting request 813289 from KDE:Qt:5.15
- Add patch to fix tool menu placement (boo#1172754, QTBUG-84462): * 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch OBS-URL: https://build.opensuse.org/request/show/813289 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=107
This commit is contained in:
commit
fdf4afd7bc
@ -0,0 +1,37 @@
|
|||||||
|
From f16d0e41bb638ffc1d83ca48321073eca1b86b42 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
||||||
|
Date: Wed, 10 Jun 2020 11:26:00 +0200
|
||||||
|
Subject: [PATCH] Fix QToolButton menus showing on primary screens in
|
||||||
|
multiscreen setups
|
||||||
|
|
||||||
|
Calculate an initial position based on the current size hint
|
||||||
|
and pass it to QMenuPrivate::exec(), which does screen checks
|
||||||
|
based on it.
|
||||||
|
|
||||||
|
Amends a78d66743171557d79b16c08be775e3ac15bb4ef.
|
||||||
|
|
||||||
|
Pick-to: 5.15
|
||||||
|
Fixes: QTBUG-84462
|
||||||
|
Task-number: QTBUG-78966
|
||||||
|
Change-Id: Icae8d2bc0fb50c4c853cfebaa2b2250fc06542e3
|
||||||
|
---
|
||||||
|
src/widgets/widgets/qtoolbutton.cpp | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
|
||||||
|
index edd4788806..0b090d2bac 100644
|
||||||
|
--- a/src/widgets/widgets/qtoolbutton.cpp
|
||||||
|
+++ b/src/widgets/widgets/qtoolbutton.cpp
|
||||||
|
@@ -805,7 +805,8 @@ void QToolButtonPrivate::popupTimerDone()
|
||||||
|
// QTBUG-78966, Delay positioning until after aboutToShow().
|
||||||
|
auto positionFunction = [q, horizontal](const QSize &sizeHint) {
|
||||||
|
return positionMenu(q, horizontal, sizeHint); };
|
||||||
|
- actualMenu->d_func()->exec({}, nullptr, positionFunction);
|
||||||
|
+ const auto initialPos = positionFunction(actualMenu->sizeHint());
|
||||||
|
+ actualMenu->d_func()->exec(initialPos, nullptr, positionFunction);
|
||||||
|
|
||||||
|
if (!that)
|
||||||
|
return;
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 10 12:31:44 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Add patch to fix tool menu placement (boo#1172754, QTBUG-84462):
|
||||||
|
* 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 27 08:48:52 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
Wed May 27 08:48:52 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||||
|
|
||||||
|
@ -66,10 +66,12 @@ Patch12: 0001-Add-remote-print-queue-support.patch
|
|||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
|
Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
|
||||||
Patch24: fix-fixqt4headers.patch
|
Patch24: fix-fixqt4headers.patch
|
||||||
# patches 1000-2000 and above from upstream 5.14 branch #
|
# patches 1000-2000 and above from upstream 5.15 branch #
|
||||||
# patches 2000-3000 and above from upstream 5.15/dev branch #
|
# patches 2000-3000 and above from upstream qt6/dev branch #
|
||||||
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
|
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
|
||||||
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
|
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
|
||||||
|
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/303786
|
||||||
|
Patch2002: 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch
|
||||||
BuildRequires: alsa-devel
|
BuildRequires: alsa-devel
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: double-conversion-devel
|
BuildRequires: double-conversion-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user