pull in upstream taskmanager fix

epel9
Rex Dieter 6 years ago
parent abb848218d
commit 7f2228944d

@ -0,0 +1,39 @@
From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Thu, 29 Nov 2018 00:22:17 +0900
Subject: [PATCH] Fix group popup dialog
Summary:
Fixes regression introduced with ab26ebb18b74: That diff contained
a change unrelated to the original submission, swapping a || out for
&& in response to a review note. This turns out to have broken things.
BUG:401508
Reviewers: davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D17219
---
applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml
index 6f592756..28238dce 100644
--- a/applets/taskmanager/package/contents/ui/GroupDialog.qml
+++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml
@@ -262,7 +262,7 @@ PlasmaCore.Dialog {
// Setting VisualDataModel.rootIndex drops groupRepeater.count to 0
// before the actual row count. updateSize is therefore invoked twice;
// only update size once the repeater count matches the model role.
- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) {
+ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) {
var task;
var maxWidth = 0;
var maxHeight = 0;
--
2.17.2

@ -4,7 +4,7 @@
Name: plasma-desktop
Summary: Plasma Desktop shell
Version: 5.14.4
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://cgit.kde.org/%{name}.git
@ -25,6 +25,7 @@ Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.t
Patch100: plasma-desktop-5.8-default_favorites.patch
## upstream patches
Patch1: 0001-Fix-group-popup-dialog.patch
## upstreamable patches
@ -176,6 +177,7 @@ BuildArch: noarch
%patch100 -p1
## upstream patches
%patch1 -p1
## upstreamable patches
@ -310,6 +312,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
%changelog
* Wed Nov 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.4-2
- pull in upstream taskmanager fix
* Tue Nov 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.4-1
- 5.14.4

Loading…
Cancel
Save