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

ScreenShield: animate new notifications

Browse Source 
Showing the new message at full size marks an abrubt change and looks
bad. Instead, gradually animate from 0px to full natural height.
Includes hacks to workaround flickering scrollbars while the animation
is in progress.

https://bugzilla.gnome.org/show_bug.cgi?id=687660
This commit is contained in:
Giovanni Campagna 2012-12-03 19:43:04 +01:00
parent b16ee1a3a6
commit 24f142df1d
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/screenShield.js
View File

@ -106,14 +106,14 @@ const NotificationsBox = new Lang.Class({
this._musicBin = new St.Bin({ style_class: 'screen-shield-notifications-box', this._musicBin = new St.Bin({ style_class: 'screen-shield-notifications-box',
visible: false }); visible: false });
let scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START, this._scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START,
hscrollbar_policy: Gtk.PolicyType.NEVER }); hscrollbar_policy: Gtk.PolicyType.NEVER });
this._notificationBox = new St.BoxLayout({ vertical: true, this._notificationBox = new St.BoxLayout({ vertical: true,
style_class: 'screen-shield-notifications-box' }); style_class: 'screen-shield-notifications-box' });
scrollView.add_actor(this._notificationBox); this._scrollView.add_actor(this._notificationBox);
this.actor.add(this._musicBin); this.actor.add(this._musicBin);
this.actor.add(scrollView, { x_fill: true, x_align: St.Align.START }); this.actor.add(this._scrollView, { x_fill: true, x_align: St.Align.START });
this._sources = new Hash.Map(); this._sources = new Hash.Map();
Main.messageTray.getSources().forEach(Lang.bind(this, function(source) { Main.messageTray.getSources().forEach(Lang.bind(this, function(source) {
@ -239,7 +239,7 @@ const NotificationsBox = new Lang.Class({
(source.unseenCount > (musicNotification ? 1 : 0)); (source.unseenCount > (musicNotification ? 1 : 0));
}, },
_sourceAdded: function(tray, source, dontUpdateVisibility) { _sourceAdded: function(tray, source, initial) {
// Ignore transient sources // Ignore transient sources
if (source.isTransient) if (source.isTransient)
return; return;
@ -286,8 +286,27 @@ const NotificationsBox = new Lang.Class({
this._sources.set(source, obj); this._sources.set(source, obj);
if (!dontUpdateVisibility) if (!initial) {
// block scrollbars while animating, if they're not needed now
let boxHeight = this._notificationBox.height;
if (this._scrollView.height >= boxHeight)
this._scrollView.vscrollbar_policy = Gtk.PolicyType.NEVER;
let widget = obj.sourceBox;
let [, natHeight] = widget.get_preferred_height(-1);
widget.height = 0;
Tweener.addTween(widget,
{ height: natHeight,
transition: 'easeOutQuad',
time: 0.25,
onComplete: function() {
this._scrollView.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
widget.set_height(-1);
},
onCompleteScope: this
});
this._updateVisibility(); this._updateVisibility();
}
}, },
_titleChanged: function(source, obj) { _titleChanged: function(source, obj) {