diff --git a/js/ui/altTab.js b/js/ui/altTab.js index beba052db..09ed73ec4 100644 --- a/js/ui/altTab.js +++ b/js/ui/altTab.js @@ -102,7 +102,7 @@ AltTabPopup.prototype = { // Contruct the AppIcons, sort by time, add to the popup let icons = []; for (let i = 0; i < apps.length; i++) - icons.push(new AppIcon.AppIcon(apps[i], AppIcon.MenuType.BELOW)); + icons.push(new AppIcon.AppIcon(apps[i], AppIcon.MenuType.BELOW, false)); icons.sort(Lang.bind(this, this._sortAppIcon)); for (let i = 0; i < icons.length; i++) this._addIcon(icons[i]); diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index eb32a59c1..206cb79a4 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -462,7 +462,7 @@ BaseWellItem.prototype = { __proto__: AppIcon.AppIcon.prototype, _init: function(appInfo, isFavorite, hasMenu) { - AppIcon.AppIcon.prototype._init.call(this, appInfo, hasMenu ? AppIcon.MenuType.ON_RIGHT : AppIcon.MenuType.NONE); + AppIcon.AppIcon.prototype._init.call(this, appInfo, hasMenu ? AppIcon.MenuType.ON_RIGHT : AppIcon.MenuType.NONE, true); this.isFavorite = isFavorite; diff --git a/js/ui/appIcon.js b/js/ui/appIcon.js index eb08eae4a..dd1aac686 100644 --- a/js/ui/appIcon.js +++ b/js/ui/appIcon.js @@ -54,7 +54,7 @@ function AppIcon(appInfo, menuType) { } AppIcon.prototype = { - _init : function(appInfo, menuType) { + _init : function(appInfo, menuType, showGlow) { this.appInfo = appInfo; this._menuType = menuType; @@ -104,16 +104,21 @@ AppIcon.prototype = { ellipsize: Pango.EllipsizeMode.END, text: appInfo.get_name() }); nameBox.add_actor(this._name); - this._glowBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL }); - let glowPath = GLib.filename_to_uri(global.imagedir + 'app-well-glow.png', ''); - for (let i = 0; i < this.windows.length && i < 3; i++) { - let glow = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER, - glowPath, -1, -1); - glow.keep_aspect_ratio = false; - this._glowBox.append(glow, Big.BoxPackFlags.EXPAND); + if (showGlow) { + this._glowBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL }); + let glowPath = GLib.filename_to_uri(global.imagedir + 'app-well-glow.png', ''); + for (let i = 0; i < this.windows.length && i < 3; i++) { + let glow = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER, + glowPath, -1, -1); + glow.keep_aspect_ratio = false; + this._glowBox.append(glow, Big.BoxPackFlags.EXPAND); + } + this._nameBox.add_actor(this._glowBox); + this._glowBox.lower(this._name); } - this._nameBox.add_actor(this._glowBox); - this._glowBox.lower(this._name); + else + this._glowBox = null; + this.actor.append(nameBox, Big.BoxPackFlags.NONE); },