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

[appSwitcher] Remove unneeded workaround

Browse Source 
SwitcherList.actor is no longer a St.BoxLayout but a
GenericContainer now, so the hack in AppSwitcher._getPreferredHeight is no
longer needed (it is called with the correct width now).

https://bugzilla.gnome.org/show_bug.cgi?id=613194
This commit is contained in:
Adel Gadllah 2010-05-24 16:52:38 +02:00
parent d80c1af1a3
commit a1bfaac5a2
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/altTab.js
View File

@ -841,6 +841,8 @@ AppSwitcher.prototype = {
_getPreferredHeight: function (actor, forWidth, alloc) { _getPreferredHeight: function (actor, forWidth, alloc) {
let j = 0; let j = 0;
let height = 0;
while(this._items.length > 1 && this._items[j].style_class != 'item-box') { while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
j++; j++;
} }
@ -851,17 +853,11 @@ AppSwitcher.prototype = {
if (this._separator) if (this._separator)
totalSpacing += this._separator.width + this._list.spacing; totalSpacing += this._separator.width + this._list.spacing;
// We just assume the whole screen here due to weirdness happing with the passed width
let focus = global.get_focus_monitor();
let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
let availWidth = focus.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
let height = 0;
for(let i = 0; i < iconSizes.length; i++) { for(let i = 0; i < iconSizes.length; i++) {
this._iconSize = iconSizes[i]; this._iconSize = iconSizes[i];
height = iconSizes[i] + iconSpacing; height = iconSizes[i] + iconSpacing;
let w = height * this._items.length + totalSpacing; let w = height * this._items.length + totalSpacing;
if (w <= availWidth) if (w <= forWidth)
break; break;
} }