updates for gnome-shell 3.14

master
Jens Lody 10 years ago
parent fc4b3820b5
commit 927f3036b6
  1. 2
      data/metadata.json.in
  2. 47
      src/extension.js

@ -2,7 +2,7 @@
"uuid": "@uuid@", "uuid": "@uuid@",
"name": "Panel OSD", "name": "Panel OSD",
"description": "Configuring where on the (main) screen notifications will appear, instead of just above the message tray", "description": "Configuring where on the (main) screen notifications will appear, instead of just above the message tray",
"shell-version": [ "3.6", "3.8", "3.10", "3.12" ], "shell-version": [ "3.6", "3.8", "3.10", "3.12", "3.14" ],
"localedir": "@LOCALEDIR@", "localedir": "@LOCALEDIR@",
"url": "@url@" "url": "@url@"
} }

@ -186,6 +186,9 @@ let extensionShowNotification = function() {
// the mouse is moving towards it or within it. // the mouse is moving towards it or within it.
this._lastSeenMouseX = x; this._lastSeenMouseX = x;
this._lastSeenMouseY = y; this._lastSeenMouseY = y;
if (ExtensionUtils.versionCheck(['3.14'], Config.PACKAGE_VERSION)) {
this._resetNotificationLeftTimeout();
}
}; };
@ -299,11 +302,17 @@ let extensionHideNotification = function(animate) {
} }
else else
{ {
if (this._notificationLeftTimeoutId) { if (ExtensionUtils.versionCheck(['3.14'], Config.PACKAGE_VERSION)) {
Mainloop.source_remove(this._notificationLeftTimeoutId); this._resetNotificationLeftTimeout();
this._notificationLeftTimeoutId = 0; }
this._notificationLeftMouseX = -1; else
this._notificationLeftMouseY = -1; {
if (this._notificationLeftTimeoutId) {
Mainloop.source_remove(this._notificationLeftTimeoutId);
this._notificationLeftTimeoutId = 0;
this._notificationLeftMouseX = -1;
this._notificationLeftMouseY = -1;
}
} }
if (animate) { if (animate) {
@ -458,12 +467,28 @@ let extensiononNotificationExpanded = function() {
} else if (this._notification.y != expandedY) { } else if (this._notification.y != expandedY) {
// Tween also opacity here, to override a possible tween that's // Tween also opacity here, to override a possible tween that's
// currently hiding the notification. // currently hiding the notification.
this._tween(this._notificationWidget, '_notificationState', State.SHOWN, if (ExtensionUtils.versionCheck(['3.14'], Config.PACKAGE_VERSION)) {
{ y: expandedY, Tweener.addTween(this._notificationWidget,
opacity: 255, { y: expandedY,
time: ANIMATION_TIME, opacity: 255,
transition: 'easeOutQuad' time: ANIMATION_TIME,
}); transition: 'easeOutQuad',
// HACK: Drive the state machine here better,
// instead of overwriting tweens
onComplete: Lang.bind(this, function() {
this._notificationState = State.SHOWN;
}),
});
}
else
{
this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
{ y: expandedY,
opacity: 255,
time: ANIMATION_TIME,
transition: 'easeOutQuad'
});
}
} }
}; };

Loading…
Cancel
Save