[gnome-shell] js: Drop tweener.js
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] js: Drop tweener.js
- Date: Wed, 15 Apr 2020 13:30:35 +0000 (UTC)
commit b3b91f1699e92c3dbaaa5965851394a7306f1398
Author: Jonas Ådahl <jadahl gmail com>
Date: Wed Apr 15 11:24:10 2020 +0200
js: Drop tweener.js
We're using clutter's animation framework now, so lets drop the old
tweener support layer.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1200
js/js-resources.gresource.xml | 1 -
js/ui/appDisplay.js | 2 +-
js/ui/environment.js | 2 -
js/ui/screenShield.js | 2 +-
js/ui/tweener.js | 228 ------------------------------------------
src/shell-global.c | 6 +-
6 files changed, 4 insertions(+), 237 deletions(-)
---
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index 2cf86a08af..6281eff7b2 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -102,7 +102,6 @@
<file>ui/swipeTracker.js</file>
<file>ui/switcherPopup.js</file>
<file>ui/switchMonitor.js</file>
- <file>ui/tweener.js</file>
<file>ui/unlockDialog.js</file>
<file>ui/userWidget.js</file>
<file>ui/viewSelector.js</file>
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 08febc4915..c8ac328414 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -638,7 +638,7 @@ var AllView = GObject.registerClass({
this._grid.currentPage = pageNumber;
- // Tween the change between pages.
+ // Animate the change between pages.
this._adjustment.ease(this._grid.getPageY(this._grid.currentPage), {
mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
duration: animate ? PAGE_SWITCH_TIME : 0,
diff --git a/js/ui/environment.js b/js/ui/environment.js
index 8f23b107e6..7a96d94800 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -356,9 +356,7 @@ function init() {
// OK, now things are initialized enough that we can import shell JS
const Format = imports.format;
- const Tweener = imports.ui.tweener;
- Tweener.init();
String.prototype.format = Format.format;
}
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 86221a3093..98279e070f 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -345,7 +345,7 @@ var ScreenShield = class {
this._lockDialogGroup.remove_all_transitions();
if (animate) {
- // Tween the lock screen out of screen
+ // Animate the lock screen out of screen
// if velocity is not specified (i.e. we come here from pressing ESC),
// use the same speed regardless of original position
// if velocity is specified, it's in pixels per milliseconds
diff --git a/src/shell-global.c b/src/shell-global.c
index ec9a052176..e70677775b 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1599,10 +1599,8 @@ shell_global_end_work (ShellGlobal *global)
* Idle means here no animations, no redrawing, and no ongoing background
* work. Since there is currently no way to hook into the Clutter master
* clock and know when is running, the implementation here is somewhat
- * approximation. Animations done through the shell's Tweener module will
- * be handled properly, but other animations may be detected as terminating
- * early if they can be drawn fast enough so that the event loop goes idle
- * between frames.
+ * approximation. Animations may be detected as terminating early if they
+ * can be drawn fast enough so that the event loop goes idle between frames.
*
* The intent of this function is for performance measurement runs
* where a number of actions should be run serially and each action is
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]