[gnome-shell/wip/aggregate-menu: 15/51] popupMenu: Ignore submenus when getting the column widths

[Jasper St. Pierre <jstpierre src gnome org>]

commit ad7566e3011e6055968df2574d7f84ae418f1776
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Jun 11 18:16:03 2013 -0400

    popupMenu: Ignore submenus when getting the column widths
    
    The new designs don't want these to be aligned the same way.

 js/ui/popupMenu.js |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index da4f573..bf4c3b3 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -895,9 +895,12 @@ const PopupMenuBase = new Lang.Class({
         let columnWidths = [];
         let items = this.box.get_children();
         for (let i = 0; i < items.length; i++) {
-            if (!items[i].visible &&
-                !(items[i]._delegate instanceof PopupSubMenu && items[i-1].visible))
+            if (!items[i].visible)
                 continue;
+
+            if (items[i]._delegate instanceof PopupSubMenu)
+                continue;
+
             if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof 
PopupMenuBase) {
                 let [itemMaxSpan, itemColumnWidths] = items[i]._delegate.getColumnWidths();
                 maxSpan = Math.max(maxSpan, itemMaxSpan);
@@ -913,6 +916,9 @@ const PopupMenuBase = new Lang.Class({
     setColumnWidths: function(widths) {
         let items = this.box.get_children();
         for (let i = 0; i < items.length; i++) {
+            if (items[i]._delegate instanceof PopupSubMenu)
+                continue;
+
             if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof 
PopupMenuBase)
                 items[i]._delegate.setColumnWidths(widths);
         }