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

messageTray: fix summary area wobbling

Browse Source 
Due to accumulation of rounding errors, the left edge of the summary area
could wobble by a few pixels during animations. Fix that.

https://bugzilla.gnome.org/show_bug.cgi?id=636930
This commit is contained in:
Dan Winship 2011-03-07 14:04:03 -05:00
parent 8d57c5052c
commit e27293edbc
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/messageTray.js
View File

@ -1339,6 +1339,8 @@ MessageTray.prototype = {
}, },
set _expandedSummaryItemTitleWidth(expansion) { set _expandedSummaryItemTitleWidth(expansion) {
expansion = Math.round(expansion);
// Expand the expanding item to its new width // Expand the expanding item to its new width
if (this._expandedSummaryItem) if (this._expandedSummaryItem)
this._expandedSummaryItem.setTitleWidth(expansion); this._expandedSummaryItem.setTitleWidth(expansion);
@ -1369,11 +1371,32 @@ MessageTray.prototype = {
if (this._summaryItems[i] == this._expandedSummaryItem) if (this._summaryItems[i] == this._expandedSummaryItem)
continue; continue;
let width = this._summaryItems[i].getTitleWidth(); let oldWidth = this._summaryItems[i].getTitleWidth();
this._summaryItems[i].setTitleWidth(width * shrinkage); let newWidth = Math.floor(oldWidth * shrinkage);
excess -= newWidth;
this._summaryItems[i].setTitleWidth(newWidth);
}
if (this._expandedSummaryItem) {
let oldWidth = this._imaginarySummaryItemTitleWidth;
let newWidth = Math.floor(oldWidth * shrinkage);
excess -= newWidth;
this._imaginarySummaryItemTitleWidth = newWidth;
}
// If the tray as a whole is fully-expanded, make sure the
// left edge doesn't wobble during animation due to rounding.
if (this._imaginarySummaryItemTitleWidth == 0 && excess != 0) {
for (let i = 0; i < this._summaryItems.length; i++) {
if (this._summaryItems[i] == this._expandedSummaryItem)
continue;
let oldWidth = this._summaryItems[i].getTitleWidth();
if (oldWidth != 0) {
this._summaryItems[i].setTitleWidth (oldWidth + excess);
break;
}
}
} }
if (this._expandedSummaryItem)
this._imaginarySummaryItemTitleWidth *= shrinkage;
}, },
_expandSummaryItemCompleted: function() { _expandSummaryItemCompleted: function() {