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

Group chat sources on the left in the message tray

Browse Source 
This will make it easier for users to get back to their chats.

https://bugzilla.gnome.org/show_bug.cgi?id=617234
This commit is contained in:
Hellyna Ng 2010-12-31 05:09:56 +08:00 committed by Marina Zhurakhinskaya
parent 0e4a47c0aa
commit 6c55ca59b0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/messageTray.js
View File

@ -806,6 +806,7 @@ Source.prototype = {
this._iconBin = new St.Bin({ width: this.ICON_SIZE, this._iconBin = new St.Bin({ width: this.ICON_SIZE,
height: this.ICON_SIZE }); height: this.ICON_SIZE });
this.isTransient = false; this.isTransient = false;
this.isChat = false;
}, },
setTransient: function(isTransient) { setTransient: function(isTransient) {
@ -1025,6 +1026,7 @@ MessageTray.prototype = {
// added to the summary without a notification being shown. // added to the summary without a notification being shown.
this._newSummaryItems = []; this._newSummaryItems = [];
this._longestSummaryItem = null; this._longestSummaryItem = null;
this._chatSummaryItemsCount = 0;
}, },
_setSizePosition: function() { _setSizePosition: function() {
@ -1058,7 +1060,12 @@ MessageTray.prototype = {
let summaryItem = new SummaryItem(source); let summaryItem = new SummaryItem(source);
this._summary.insert_actor(summaryItem.actor, 0); if (source.isChat) {
this._summary.insert_actor(summaryItem.actor, 0);
this._chatSummaryItemsCount++;
} else {
this._summary.insert_actor(summaryItem.actor, this._chatSummaryItemsCount);
}
let titleWidth = summaryItem.getTitleNaturalWidth(); let titleWidth = summaryItem.getTitleNaturalWidth();
if (titleWidth > this._summaryItemTitleWidth) { if (titleWidth > this._summaryItemTitleWidth) {
@ -1123,6 +1130,10 @@ MessageTray.prototype = {
this._newSummaryItems.splice(newSummaryItemsIndex, 1); this._newSummaryItems.splice(newSummaryItemsIndex, 1);
this._summaryItems.splice(index, 1); this._summaryItems.splice(index, 1);
if (source.isChat)
this._chatSummaryItemsCount--;
if (this._longestSummaryItem.source == source) { if (this._longestSummaryItem.source == source) {
let newTitleWidth = 0; let newTitleWidth = 0;
this._longestSummaryItem = null; this._longestSummaryItem = null;

2
js/ui/telepathyClient.js
View File

@ -455,6 +455,8 @@ Source.prototype = {
_init: function(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) { _init: function(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
MessageTray.Source.prototype._init.call(this, targetId); MessageTray.Source.prototype._init.call(this, targetId);
this.isChat = true;
this._accountPath = accountPath; this._accountPath = accountPath;
let connName = Telepathy.pathToName(connPath); let connName = Telepathy.pathToName(connPath);