From e5385cffd7fb5c9aa8cf238831d7425ba7bf988bc789bc8ab0f4e4dacdae1fd2 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 29 Jul 2016 16:52:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=232 --- ...to-include-only-desktops-in-desktops.patch | 28 +++++++++++++++++++ plasma5-workspace.changes | 1 + plasma5-workspace.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 0001-check-harder-to-include-only-desktops-in-desktops.patch diff --git a/0001-check-harder-to-include-only-desktops-in-desktops.patch b/0001-check-harder-to-include-only-desktops-in-desktops.patch new file mode 100644 index 0000000..a511cfa --- /dev/null +++ b/0001-check-harder-to-include-only-desktops-in-desktops.patch @@ -0,0 +1,28 @@ +From a2850caf4a442c5e92d4c027b9a1c78c9dee24b5 Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Fri, 29 Jul 2016 13:23:18 +0200 +Subject: [PATCH 1/2] check harder to include only desktops in desktops() + +only desktops have an assigned activtyId, but some +containments are !isPanel() (like the systray) +--- + shell/scripting/scriptengine.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp +index f368e7e3b918bb09e69a3cb486680ab3d85fd15e..a17ba1a708ddc69caa483a667c7c390c52d6d84b 100644 +--- a/shell/scripting/scriptengine.cpp ++++ b/shell/scripting/scriptengine.cpp +@@ -882,7 +882,8 @@ QScriptValue ScriptEngine::desktops(QScriptContext *context, QScriptEngine *engi + int count = 0; + + foreach (Plasma::Containment *c, env->corona()->containments()) { +- if (!isPanel(c)) { ++ //make really sure we get actual desktops, so check for a non empty activty id ++ if (!isPanel(c) && !c->activity().isEmpty()) { + containments.setProperty(count, env->wrap(c)); + ++count; + } +-- +2.6.6 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 92befa8..b643365 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -7,6 +7,7 @@ Thu Jul 28 20:33:35 UTC 2016 - hrvoje.senjan@gmail.com 0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch 0007-apparently-containment-can-be-null.patch 0010-Properly-registering-existing-activities-before-load.patch + 0001-check-harder-to-include-only-desktops-in-desktops.patch ------------------------------------------------------------------- Wed Jul 20 08:54:41 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index af5756c..414346f 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -39,6 +39,7 @@ Patch101: 0005-Missing-method-for-activity-deletion-from-plasma-scr.patch Patch102: 0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch Patch103: 0007-apparently-containment-can-be-null.patch Patch104: 0010-Properly-registering-existing-activities-before-load.patch +Patch105: 0001-check-harder-to-include-only-desktops-in-desktops.patch # PATCHES 201-300 and above are from upstream master/5.8 branch # PATCH-FEATURE-UPSTREAM Configuration-option-for-System-Tray-icon-size.patch Patch201: Configuration-option-for-System-Tray-icon-size.patch @@ -225,6 +226,7 @@ workspace. Development files. %patch102 -p1 %patch103 -p1 %patch104 -p1 +%patch105 -p1 %patch201 -p1 %build