pool/plasma5-workspace
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 981524 from home:fusionfuture:branches:KDE:Frameworks5

Browse Source 
- Add patch to fix a multiscreen bug when PLASMA_USE_QT_SCALING=1
  (kde#450443, https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781)
  * 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch

OBS-URL: https://build.opensuse.org/request/show/981524
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=646
This commit is contained in:
Fabian Vogt
2022-06-10 08:23:03 +00:00
committed by Git OBS Bridge
parent f86a1f7f2a
commit a533ec9152
3 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch Normal file
View File

@@ -0,0 +1,66 @@
From 0cc230ec7f5bde0e61d1080512db72e3cc1a28f6 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Sun, 29 May 2022 14:47:39 +0800
Subject: [PATCH] shell: refresh geometries of all `DesktopView` and
`PanelView` when receiving `logicalDotsPerInchChanged`
Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
BUG: 450443
FIXED-IN: 5.24.6
---
shell/desktopview.cpp | 8 ++++++++
shell/panelview.cpp | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp
index 54f759f3b..8002f085e 100644
--- a/shell/desktopview.cpp
+++ b/shell/desktopview.cpp
@@ -118,12 +118,20 @@ void DesktopView::adaptToScreen()
if (m_oldScreen) {
disconnect(m_oldScreen.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_oldScreen.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged);
+ }
}
if (m_windowType == Desktop || m_windowType == WindowedDesktop) {
screenGeometryChanged();
connect(m_screenToFollow.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(m_screenToFollow.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ }
}
m_oldScreen = m_screenToFollow;
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index a0af15be8..aa921ddfa 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -935,10 +935,18 @@ void PanelView::setScreenToFollow(QScreen *screen)
// disconnect from old screen
disconnect(m_screenToFollow, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts);
disconnect(m_screenToFollow, &QScreen::geometryChanged, this, &PanelView::restore);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_screenToFollow, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore);
+ }
}
connect(screen, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts, Qt::UniqueConnection);
connect(screen, &QScreen::geometryChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(screen, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ }
/*connect(screen, &QObject::destroyed, this, [this]() {
if (PanelView::screen()) {
--
2.36.1

7
plasma5-workspace.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 9 11:39:29 UTC 2022 - Fusion Future <qydwhotmail@gmail.com>
- Add patch to fix a multiscreen bug when PLASMA_USE_QT_SCALING=1
(kde#450443, https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781)
* 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
-------------------------------------------------------------------
Thu Jun 9 11:15:05 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

2
plasma5-workspace.spec
View File

@@ -46,6 +46,8 @@ Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-UPSTREAM kde#450443 https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781
Patch507: 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
%if 0%{?suse_version} < 1550