[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-1-12-g9259880

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=97f740a

The following commit has been merged in the master branch:
commit 97f740a0f7140587c3d297e0e6d1480a894bc7b1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Apr 8 15:13:59 2017 +0200

    Pick "correctly forward status from applets to containment" (47ec9b8)
    
    Add upstream patch as:
     correctly-forward-status-from-applets-to-containment.patch
    This fixes KDE#372062
    
    Gbp-Dch: Full
---
 ...orward-status-from-applets-to-containment.patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/correctly-forward-status-from-applets-to-containment.patch b/debian/patches/correctly-forward-status-from-applets-to-containment.patch
new file mode 100644
index 0000000..ba6e1ea
--- /dev/null
+++ b/debian/patches/correctly-forward-status-from-applets-to-containment.patch
@@ -0,0 +1,56 @@
+From: Marco Martin <notmart at gmail.com>
+Date: Tue, 17 Jan 2017 17:23:07 +0100
+Subject: correctly forward status from applets to containment
+
+Summary:
+unfortunately hiddenvisibility is the "biggest" status
+that makes computing the proper status tricky.
+if an applet in the containment is hidden, we must not mark as
+hidden the whole containment, because it's as if hidden was
+(as it should be) the smallest in the enum
+
+BUG:372062
+
+Test Plan: touchpad plasmoid no longer hides the systray
+
+Reviewers: #plasma, davidedmundson
+
+Reviewed By: #plasma, davidedmundson
+
+Subscribers: plasma-devel, #frameworks
+
+Tags: #plasma, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D4174
+---
+ src/plasma/plasma.h                  | 1 +
+ src/plasma/private/containment_p.cpp | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h
+index 523e32915..eb34aee3f 100644
+--- a/src/plasma/plasma.h
++++ b/src/plasma/plasma.h
+@@ -255,6 +255,7 @@ public:
+         NeedsAttentionStatus = 3, /**< The Item needs attention **/
+         RequiresAttentionStatus = 4, /**< The Item needs persistent attention **/
+         AcceptingInputStatus = 5, /**< The Item is accepting input **/
++        //FIXME KF6: this should be the smallest status
+         HiddenStatus = 6    /**< The Item will be hidden totally  **/
+     };
+     Q_ENUMS(ItemStatus)
+diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
+index 061176b95..646c80021 100644
+--- a/src/plasma/private/containment_p.cpp
++++ b/src/plasma/private/containment_p.cpp
+@@ -123,7 +123,9 @@ void ContainmentPrivate::checkStatus(Plasma::Types::ItemStatus appletStatus)
+         }
+     }
+ 
+-    q->setStatus(appletStatus);
++    if (appletStatus > q->status() && appletStatus != Plasma::Types::HiddenStatus) {
++        q->setStatus(appletStatus);
++    }
+ }
+ 
+ void ContainmentPrivate::triggerShowAddWidgets()
diff --git a/debian/patches/series b/debian/patches/series
index c6d5796..13d4213 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch
 consider-an-empty-panel-always-applets-loaded.patch
 Fix-374127-misplacement-of-popups-from-dock-wins.patch
 portait-prop-is-not-relevant-when-there-is-no-text.patch
+correctly-forward-status-from-applets-to-containment.patch

-- 
plasma-framework packaging