Merge branch 'develop'

Author: mpdeimos

.travis.yml

@@ -1,15 +1,19 @@
 language: node_js
-
 env:
-  - secure: "ZqWi5+UtHF6OVhY+cIxdUtbIomrXBex0URSV8dSihjmAQkZ812HddwFbK9+vb8z+IZ/nmOvA6WkUnW0QfMs0kKr0Sp/y7DzhTr1ResDiOGsDE2csX9nsNaHwaL+nggAo/fYrqzvtuI2LjG7fCaCl5VgWDvuEYyTsLjvrZjy9KRE="
-
+- secure: ZqWi5+UtHF6OVhY+cIxdUtbIomrXBex0URSV8dSihjmAQkZ812HddwFbK9+vb8z+IZ/nmOvA6WkUnW0QfMs0kKr0Sp/y7DzhTr1ResDiOGsDE2csX9nsNaHwaL+nggAo/fYrqzvtuI2LjG7fCaCl5VgWDvuEYyTsLjvrZjy9KRE=
 install: make deps
-
 script: make all publish
-
 notifications:
   email:
     recipients:
-      - secure: h1GEDEutgLEHdft95f0AsDeIUKBb4FbX0NJNDlIec8f/wXkWpWUjlSTQOnSCFIYzeon1d3kCxGoIM9lBtP/6uM5L71Dtm8EHQTGqqFQ8cszfyJCPRfB+wvnyZvOAMG/V3H/4NECUqOES6DEcrpQTMuz5dDpMGeHnoLK63pttIok=
+    - secure: h1GEDEutgLEHdft95f0AsDeIUKBb4FbX0NJNDlIec8f/wXkWpWUjlSTQOnSCFIYzeon1d3kCxGoIM9lBtP/6uM5L71Dtm8EHQTGqqFQ8cszfyJCPRfB+wvnyZvOAMG/V3H/4NECUqOES6DEcrpQTMuz5dDpMGeHnoLK63pttIok=
     on_success: always
-
+deploy:
+  provider: releases
+  api_key:
+    secure: pVieeKuVBwtfvo3hadF3J+xH5yP5+SWV+tkXe1LGTqTd0uc6TbhnPIf7rcjgG8ujfoQqYrkIthJMeQ2Fyz3YisEinY2rYXaaDQk/4X8OEw1+6Qo/FNogycn0GeAu7vnUrlW2RcZxIa1KFweRkCZ553CaqMHurOWar8VukskTzRk=
+  file: remove-dropdown-arrows@mpdeimos.com.zip
+  skip_cleanup: true
+  on:
+    repo: mpdeimos/gnome-shell-remove-dropdown-arrows
+    tags: true

extension.js

@@ -1,64 +1,166 @@
 /* jshint esnext:true */
 
+const GLib = imports.gi.GLib;
 const Main = imports.ui.main;
-const Lang = imports.lang;
-const ExtensionSystem = imports.ui.extensionSystem;
+const Mainloop = imports.mainloop;
 
-let _extensionChangedId;
 
-function init()
+const MAX_RECURSE_DEPTH = 3;
+
+let signalConnections = [];
+let dropdowns = [];
+
+
+/**
+ * Try hide a single dropdown actor.
+ *
+ * Return true on success.
+ */
+function _apply(actor)
 {
-	/* no initialization required */
+    if (!actor.has_style_class_name || !actor.has_style_class_name('popup-menu-arrow'))
+    {
+        return false;
+    }
+    
+    actor.hide();
+
+    if (dropdowns.indexOf(actor) < 0)
+    {
+        let connection = {
+            object: actor,
+            id: actor.connect('destroy', function()
+            {
+                let index;
+
+                index = signalConnections.indexOf(connection);
+                if (index >= 0)
+                {
+                    signalConnections.splice(index, 1);
+                }
+
+                index = dropdowns.indexOf(actor);
+                if (index >= 0)
+                {
+                    dropdowns.splice(index, 1);
+                }
+            })
+        };
+        signalConnections.push(connection);
+        dropdowns.push(actor);
+    }
+
+    return true;
 }
 
-function enable()
+/**
+ * Similar function to _recursiveApply(), but intended for containers.
+ */
+function _recursiveApplyInternal(actor, depth)
+{
+    if (typeof actor.get_children === 'undefined')
+    {
+        return false;
+    }
+    
+    let children = actor.get_children();
+    
+    // If there are no children then it's possible that actor hasn't been fully initialized yet.
+    // Shedule to check later.
+    if (children.length == 0)
+    {
+        _scheduleApply(actor);
+        return false;
+    }
+
+    // Check actor immediate children before using recursion
+    for (let index = 0; index < children.length; index++)
+    {
+        if (_apply(children[index]))
+        {
+            return true;
+        }
+    }
+
+    // Check children recursively
+    if (depth < MAX_RECURSE_DEPTH)
+    {
+        for (let index = 0; index < children.length; index++)
+        {
+            if (_recursiveApplyInternal(children[index], depth + 1))
+            {
+                return true;
+            }
+        }        
+    }
+
+    return false;
+}
+
+function _scheduleApply(actor)
 {
-    edit(true);
-    _extensionChangedId = ExtensionSystem.connect('extension-state-changed', onExtensionStateChanged);
+    let actorAddedId, destroyId, timeoutId;
+    actorAddedId = actor.connect('actor-added', function(child)
+    {
+        if (_recursiveApply(child))
+        {
+            actor.disconnect(actorAddedId);
+            actor.disconnect(destroyId);
+            Mainloop.source_remove(timeoutId);
+            actorAddedId = destroyId = timeoutId = 0;
+        }
+    });
+    destroyId = actor.connect('destroy', function()
+    {
+        if (timeoutId != 0) {
+            Mainloop.source_remove(timeoutId);
+            timeoutId = 0;
+        }
+    });
+    timeoutId = Mainloop.idle_add(function()
+    {
+        actor.disconnect(actorAddedId);
+        actor.disconnect(destroyId);
+        actorAddedId = destroyId = timeoutId = 0;
+        return GLib.SOURCE_REMOVE;
+    });
 }
 
-function disable()
+function _recursiveApply(actor)
 {
-	ExtensionSystem.disconnect(_extensionChangedId);
-	edit(false);
+    return _apply(actor) || _recursiveApplyInternal(actor, 0);
 }
 
-function onExtensionStateChanged()
+function init()
 {
-    edit(true);
+	// no initialization required
 }
 
-function edit(hide)
+function enable()
 {
-	for (let id in Main.panel.statusArea)
-	{
-	    let item = Main.panel.statusArea[id];
-	    if (typeof item.actor !== 'undefined')
-	    {
-            recursiveEdit(item.actor, hide);
-	    }  
-	}
+    Main.panel.actor.get_children().forEach(
+        function(actor)
+        {
+            signalConnections.push({
+                object: actor,
+                id: actor.connect('actor-added', _recursiveApply)
+            });
+
+            actor.get_children().forEach(_recursiveApply);
+        });
 }
 
-function recursiveEdit(widget, hide)
+function disable()
 {
-    if (widget.text === '\u25BE' || widget.text === '\u25B4' || // regular text drop down arrow (3.10)
-       (widget.has_style_class_name && widget.has_style_class_name('popup-menu-arrow'))) // image drop down arrow (3.12)
+    while (signalConnections.length > 0)
     {
-        if (hide)
-        {
-            widget.hide();
-        }
-        else
-        {   
-            widget.show();
-        }
-        
-        return;
+        let connection = signalConnections.pop();
+        connection.object.disconnect(connection.id);
     }
-    
-    if (typeof widget.get_children !== 'undefined')
+
+    while (dropdowns.length > 0)
     {
-        widget.get_children().forEach(function(child) { recursiveEdit(child, hide); });
+        let actor = dropdowns.pop();
+        actor.show();
     }
 }

metadata.json

@@ -4,5 +4,5 @@
 	"name": "Remove Dropdown Arrows",
 	"description": "Removes the dropdown arrows which were introduced in Gnome 3.10 from the App Menu, System Menu, Input Menu, Access Menu, Places Menu, Applications Menu and any other extension that wants to add dropdown arrows.",
 	"url": "http://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows",
-	"shell-version": ["3.10","3.12","3.14", "3.16", "3.18", "3.20", "3.22"]
+	"shell-version": ["3.12","3.14", "3.16", "3.18", "3.20", "3.22", "3.24", "3.26", "3.28"]
 }