This commit is contained in:
parent
12cebc449c
commit
e5385cffd7
28
0001-check-harder-to-include-only-desktops-in-desktops.patch
Normal file
28
0001-check-harder-to-include-only-desktops-in-desktops.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From a2850caf4a442c5e92d4c027b9a1c78c9dee24b5 Mon Sep 17 00:00:00 2001
|
||||
From: Marco Martin <notmart@gmail.com>
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user