consider hidden separators when needed

4 years ago · 07d819727b
parent 122ce05944
commit 07d819727b
2 changed files with 9 additions and 3 deletions
--- a/declarativeimports/abilities/items/BasicItem.qml
+++ b/declarativeimports/abilities/items/BasicItem.qml
@ -173,7 +173,9 @@ Item{

        var tail = index - 1;

-        while(tail>=0 && abilityItem.abilities.indexer.hidden.indexOf(tail)>=0) {
+        while(tail>=0
+              && abilityItem.abilities.indexer.hidden.indexOf(tail)>=0 /*ignore hidden items but not hidden separators*/
+              && abilityItem.abilities.separators.indexOf(head)>0) {
            tail = tail - 1;
        }

@ -213,7 +215,9 @@ Item{

        var head = index + 1;

-        while(head>=0 && abilityItem.abilities.indexer.hidden.indexOf(head)>=0) {
+        while(head>=0
+              && abilityItem.abilities.indexer.hidden.indexOf(head)>=0 /*ignore hidden items but not hidden separators*/
+              && abilityItem.abilities.separators.indexOf(head)>0) {
            head = head + 1;
        }

--- a/plasmoid/package/contents/ui/abilities/Launchers.qml
+++ b/plasmoid/package/contents/ui/abilities/Launchers.qml
@ -211,7 +211,9 @@ Item {
    function inCurrentActivity(launcherUrl) {
        var activities = _launchers.tasksModel.launcherActivities(launcherUrl);

-        if (activities.indexOf(_NULLACTIVITYID_) !== -1 || activities.indexOf(activityInfo.currentActivity) !== -1) {
+        if (activities.length ===0
+                || activities.indexOf(_NULLACTIVITYID_) >= 0
+                || activities.indexOf(activityInfo.currentActivity) >= 0) {
            return true;
        }