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

[MessageTray] fix ellipsization when the title is too long

Browse Source 
The code previously assumed that an StLabel with a 0-width allocation
would not be visible; this is apparently not true.

Part of https://bugzilla.gnome.org/show_bug.cgi?id=608915
This commit is contained in:
Dan Winship 2010-02-03 15:15:12 -05:00
parent ed129b40a3
commit f1fb0d32c6
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/messageTray.js
View File

@ -153,15 +153,21 @@ Notification.prototype = {
titleBox.y2 = titleNatH; titleBox.y2 = titleNatH;
this._titleText.allocate(titleBox, flags); this._titleText.allocate(titleBox, flags);
let bannerBox = new Clutter.ActorBox(); if (titleBox.x2 + spacing > availWidth) {
bannerBox.x1 = Math.min(titleBox.x2 + spacing, availWidth); this._bannerText.hide();
bannerBox.y1 = 0;
bannerBox.x2 = Math.min(bannerBox.x1 + bannerNatW, availWidth);
bannerBox.y2 = titleNatH;
this._bannerText.allocate(bannerBox, flags);
if (bannerBox.x2 < bannerBox.x1 + bannerNatW)
this._canPopOut = true; this._canPopOut = true;
} else {
let bannerBox = new Clutter.ActorBox();
bannerBox.x1 = titleBox.x2 + spacing;
bannerBox.y1 = 0;
bannerBox.x2 = Math.min(bannerBox.x1 + bannerNatW, availWidth);
bannerBox.y2 = titleNatH;
this._bannerText.show();
this._bannerText.allocate(bannerBox, flags);
if (bannerBox.x2 < bannerBox.x1 + bannerNatW)
this._canPopOut = true;
}
}, },
popOut: function() { popOut: function() {