brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

popupMenu: Ignore submenus when getting the column widths

Browse Source 
The new designs don't want these to be aligned the same way.

https://bugzilla.gnome.org/show_bug.cgi?id=702539
This commit is contained in:
Jasper St. Pierre 2013-06-11 18:16:03 -04:00
parent 2fa40555e6
commit ef1eabf033
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/popupMenu.js
View File

@ -890,9 +890,12 @@ const PopupMenuBase = new Lang.Class({
let columnWidths = []; let columnWidths = [];
let items = this.box.get_children(); let items = this.box.get_children();
for (let i = 0; i < items.length; i++) { for (let i = 0; i < items.length; i++) {
if (!items[i].visible && if (!items[i].visible)
!(items[i]._delegate instanceof PopupSubMenu && items[i-1].visible))
continue; continue;
if (items[i]._delegate instanceof PopupSubMenu)
continue;
if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) { if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) {
let itemColumnWidths = items[i]._delegate.getColumnWidths(); let itemColumnWidths = items[i]._delegate.getColumnWidths();
for (let j = 0; j < itemColumnWidths.length; j++) { for (let j = 0; j < itemColumnWidths.length; j++) {
@ -907,6 +910,9 @@ const PopupMenuBase = new Lang.Class({
setColumnWidths: function(widths) { setColumnWidths: function(widths) {
let items = this.box.get_children(); let items = this.box.get_children();
for (let i = 0; i < items.length; i++) { 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) if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase)
items[i]._delegate.setColumnWidths(widths); items[i]._delegate.setColumnWidths(widths);
} }