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

[appSwitcher] Display on primary monitor

Browse Source 
Displaying it on the focused monitor seems to confuse users so revert back to
using the primary monitor as per designer's request.

https://bugzilla.gnome.org/show_bug.cgi?id=619854
This commit is contained in:
Adel Gadllah 2010-05-27 19:52:49 +02:00
parent a57a34c540
commit d31e905978
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/ui/altTab.js
View File

@ -69,7 +69,7 @@ AltTabPopup.prototype = {
_allocate: function (actor, box, flags) { _allocate: function (actor, box, flags) {
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
let focus = global.get_focus_monitor(); let primary = global.get_primary_monitor();
let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT); let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT); let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
@ -79,11 +79,11 @@ AltTabPopup.prototype = {
// Allocate the appSwitcher // Allocate the appSwitcher
// We select a size based on an icon size that does not overflow the screen // We select a size based on an icon size that does not overflow the screen
let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(focus.width - hPadding); let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(primary.width - hPadding);
let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight); let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
childBox.x1 = Math.max(focus.x + leftPadding, focus.x + Math.floor((focus.width - childNaturalWidth) / 2)); childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
childBox.x2 = Math.min(childBox.x1 + focus.width - hPadding, childBox.x1 + childNaturalWidth); childBox.x2 = Math.min(childBox.x1 + primary.width - hPadding, childBox.x1 + childNaturalWidth);
childBox.y1 = focus.y + Math.floor((focus.height - childNaturalHeight) / 2); childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
childBox.y2 = childBox.y1 + childNaturalHeight; childBox.y2 = childBox.y1 + childNaturalHeight;
this._appSwitcher.actor.allocate(childBox, flags); this._appSwitcher.actor.allocate(childBox, flags);
@ -97,10 +97,10 @@ AltTabPopup.prototype = {
let [posX, posY] = icon.get_transformed_position(); let [posX, posY] = icon.get_transformed_position();
let thumbnailCenter = posX + icon.width / 2; let thumbnailCenter = posX + icon.width / 2;
let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1); let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1);
childBox.x1 = Math.max(focus.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2)); childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
if (childBox.x1 + childNaturalWidth > focus.x + focus.width - hPadding) { if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
let offset = childBox.x1 + childNaturalWidth - focus.width + hPadding; let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
childBox.x1 = Math.max(focus.x + leftPadding, childBox.x1 - offset - hPadding); childBox.x1 = Math.max(primary.x + leftPadding, childBox.x1 - offset - hPadding);
} }
let [found, spacing] = this.actor.get_theme_node().get_length('spacing', false); let [found, spacing] = this.actor.get_theme_node().get_length('spacing', false);
@ -108,10 +108,10 @@ AltTabPopup.prototype = {
spacing = 0; spacing = 0;
childBox.x2 = childBox.x1 + childNaturalWidth; childBox.x2 = childBox.x1 + childNaturalWidth;
if (childBox.x2 > focus.x + focus.width - rightPadding) if (childBox.x2 > primary.x + primary.width - rightPadding)
childBox.x2 = focus.x + focus.width - rightPadding; childBox.x2 = primary.x + primary.width - rightPadding;
childBox.y1 = this._appSwitcher.actor.allocation.y2 + spacing; childBox.y1 = this._appSwitcher.actor.allocation.y2 + spacing;
this._thumbnails.addClones(focus.height - bottomPadding - childBox.y1); this._thumbnails.addClones(primary.height - bottomPadding - childBox.y1);
let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1); let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
childBox.y2 = childBox.y1 + childNaturalHeight; childBox.y2 = childBox.y1 + childNaturalHeight;
this._thumbnails.actor.allocate(childBox, flags); this._thumbnails.actor.allocate(childBox, flags);
@ -601,7 +601,7 @@ SwitcherList.prototype = {
this._items[this._highlighted].style_class = 'selected-item-box'; this._items[this._highlighted].style_class = 'selected-item-box';
} }
let monitor = global.get_focus_monitor(); let monitor = global.get_primary_monitor();
let itemSize = this._items[index].allocation.x2 - this._items[index].allocation.x1; let itemSize = this._items[index].allocation.x2 - this._items[index].allocation.x1;
let [posX, posY] = this._items[index].get_transformed_position(); let [posX, posY] = this._items[index].get_transformed_position();
posX += this.actor.x; posX += this.actor.x;
@ -629,7 +629,7 @@ SwitcherList.prototype = {
_scrollToRight : function() { _scrollToRight : function() {
this._scrollableLeft = true; this._scrollableLeft = true;
let monitor = global.get_focus_monitor(); let monitor = global.get_primary_monitor();
let padding = this.actor.get_theme_node().get_horizontal_padding(); let padding = this.actor.get_theme_node().get_horizontal_padding();
let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding(); let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + parentPadding; let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + parentPadding;
@ -726,9 +726,9 @@ SwitcherList.prototype = {
let children = this._list.get_children(); let children = this._list.get_children();
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
let focus = global.get_focus_monitor(); let primary = global.get_primary_monitor();
let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT); let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
if (this.actor.allocation.x2 == focus.x + focus.width - parentRightPadding) { if (this.actor.allocation.x2 == primary.x + primary.width - parentRightPadding) {
if (this._squareItems) if (this._squareItems)
childWidth = childHeight; childWidth = childHeight;
else { else {