[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-1-12-g9259880
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Apr 8 15:16:04 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=bb222b2
The following commit has been merged in the master branch:
commit bb222b2ad1d27a01834a53637d06649f248948fd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Apr 8 11:00:24 2017 +0200
Pick "consider an empty panel always "applets loaded"" (6ae3a07)
This fixes panels sometimes not showing up when reconnecting screens.
Add upstream patch as:
consider-an-empty-panel-always-applets-loaded.patch
Related to KDE#373836
Gbp-Dch: Full
---
...ider-an-empty-panel-always-applets-loaded.patch | 28 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 29 insertions(+)
diff --git a/debian/patches/consider-an-empty-panel-always-applets-loaded.patch b/debian/patches/consider-an-empty-panel-always-applets-loaded.patch
new file mode 100644
index 0000000..baf3861
--- /dev/null
+++ b/debian/patches/consider-an-empty-panel-always-applets-loaded.patch
@@ -0,0 +1,28 @@
+From: Marco Martin <notmart at gmail.com>
+Date: Wed, 21 Dec 2016 18:10:04 +0100
+Subject: consider an empty panel always "applets loaded"
+
+if a panel doesn't ahve applets, it can't have a "currently
+loading" as the status of its applets.
+this fixes panels sometimes not showing up when reconnecting screens
+
+CCBUG:373836
+---
+ src/plasma/containment.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp
+index 133220a6a..b9c8c8b56 100644
+--- a/src/plasma/containment.cpp
++++ b/src/plasma/containment.cpp
+@@ -297,6 +297,10 @@ void Containment::restoreContents(KConfigGroup &group)
+ d->createApplet(plugin, QVariantList(), appId);
+ }
+
++ //if there are no applets, none of them is "loading"
++ if (Containment::applets().isEmpty()) {
++ d->appletsUiReady = true;
++ }
+ foreach (Applet *applet, Containment::applets()) {
+ if (!applet->pluginMetaData().isValid()) {
+ applet->updateConstraints(Plasma::Types::UiReadyConstraint);
diff --git a/debian/patches/series b/debian/patches/series
index 49c0edd..ffbfb19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Fix-logic-for-arrow-handling-in-RTL-locales.patch
Emit-toolTipMainTextChanged-if-it-changes-in-response-to-.patch
+consider-an-empty-panel-always-applets-loaded.patch
--
plasma-framework packaging
More information about the pkg-kde-commits
mailing list