SHA256
1
0
forked from pool/breeze

Plasma 5.22.0, disable publishing before accepting. ksystemstats5 link fixed, cherry-picked revert removed from .changes

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze?expand=0&rev=337
This commit is contained in:
Wolfgang Bauer 2021-06-04 12:42:04 +00:00 committed by Git OBS Bridge
parent 4aecc072df
commit e255f1186d
7 changed files with 31 additions and 70 deletions

View File

@ -1,51 +0,0 @@
From 96eecd246771bf9db425e9be758401494d4d2131 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 15 May 2021 17:45:54 +0200
Subject: [PATCH] Fix informing the underlying widget when leaving
SplitterProxy
While the SplitterProxy is active, it intercepts all relevant events, so that
the underlying widget still thinks it's in the same "on splitter" state. When
the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove
event to make it aware of the new current cursor position. Without this, it
doesn't know that it's not supposed to be in the "on splitter" state, and when
it regains focus it just re-activates the SplitterProxy at the current cursor
position.
This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing
when above another QSplitterHandle"), which moved the hide() call past the
call to QCoreApplication::sendEvent. Previously that made isVisible() false,
which also prevented the interception of the HoverLeave/HoverMove events.
BUG: 436473
(cherry picked from commit f99b7ef621c9c69544158d245699fd8104db6753)
---
kstyle/breezesplitterproxy.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp
index 0cf5685f..d4db407b 100644
--- a/kstyle/breezesplitterproxy.cpp
+++ b/kstyle/breezesplitterproxy.cpp
@@ -341,11 +341,14 @@ namespace Breeze
// send hover event
if( _splitter )
{
- QHoverEvent hoverEvent(
- qobject_cast<QSplitterHandle*>(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
- _splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
- QCoreApplication::sendEvent( _splitter.data(), &hoverEvent );
+ // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter,
+ // but this is meant to reach it directly. Unset _splitter to stop interception.
+ auto splitter = _splitter;
_splitter.clear();
+ QHoverEvent hoverEvent(
+ qobject_cast<QSplitterHandle*>(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
+ splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
+ QCoreApplication::sendEvent( splitter.data(), &hoverEvent );
}
// kill timer if any
--
2.25.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47994f7c578bbd2252780d315ffdf8c04ebacc343d78451378d63ef1ae2dc098
size 26280028

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdI3kACgkQ7JTRj38F
mX4jYQf+NABpbisI0QDsO2jEa8EDwbhcOjBrCTXRMGqmlAt0AtnhfkIS6BFQDrOd
fonc0X3BHzTAuu2PwU7QoDf0EtbbF13QYoJLwU6HW5egWamKTMQFrPfTC9U1MJ0/
t0jwCaoxlLlEnEf2xOR/ubbkrP9uvgZ9Ic1vd6wOTBfdVV2tGdg3gxZ7h0zRqBrx
0nw/kkNCZw8AJNcDYqkB38WzfRPv6ogGuzyw2FKjfCrEJM0L71y7mjtb+hjYmUMC
nGKW1A40kTxgATmIWDCbNk02xE/wTOuRupTwUgpo8Gr0J9QfvbZ/fCHoBI6rmgOG
/d1zG3jgTWsTdG/L3+RsMz2Olp2DvQ==
=MFMO
-----END PGP SIGNATURE-----

3
breeze-5.22.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b3d2d00bfbafe7cfb6f540809cd89447a52e00c6c435bb671c944af0f2f96ef
size 34545996

11
breeze-5.22.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC437AACgkQ7JTRj38F
mX4klwf9FPj09QZe6mTQZ53WxPaIyCElRlaT1GbCoDfTKfGGJ0hig8NnO0TsgjYM
rWqvwhBwy7i5G3yEBAT6IC2OMGfhbFSrqJaIdu329V8rvLeLxFEyYoLUFYPOCE6y
YuyLCi70YTG2PeDSyRCmPe/nyqVEWkChUx3YS96I2AYk+VUA4L3Db5CH59TuEL2s
REjV5b5I8bTbIXqyguK3/KpP1el64HKn/g48ovG/to3XohfAek9bPuf88L8aJyNg
YoDBP7wq7rRLwcbSDwdvqsxyS9KGrpFhTW0a2n2TR7iav1Rsd6bd1O3DqLtSG9pd
t9wCE7D5Ue+lxg/bg+1qY40cF9wiFQ==
=TOCh
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jun 3 13:06:12 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.22.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.22.0
- Changes since 5.21.90:
* Update new wallpaper name and breeze dark and twilight previews
* Add new default wallpaper
* Fix informing the underlying widget when leaving SplitterProxy (kde#436473)
- Drop patches, now upstream:
* 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch
-------------------------------------------------------------------
Fri May 28 06:47:58 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -22,19 +22,17 @@
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: breeze
Version: 5.21.90
Version: 5.22.0
Release: 0
Summary: Plasma Desktop artwork, styles and assets
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org
Source: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz
Source: breeze-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-%{version}.tar.xz.sig
Source1: breeze-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-informing-the-underlying-widget-when-leaving-Spl.patch
BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules >= 0.0.13
BuildRequires: fdupes