[gnome-shell] pageIndicators: Remove animated indicators
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] pageIndicators: Remove animated indicators
- Date: Wed, 3 Feb 2021 12:50:48 +0000 (UTC)
commit a9cbbd8017031ec3e762ba98c84c6a16169c0eee
Author: Florian Müllner <fmuellner gnome org>
Date: Wed Feb 3 02:32:36 2021 +0100
pageIndicators: Remove animated indicators
Nothing uses them anymore, so clean out the code.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1629>
js/ui/pageIndicators.js | 94 ++-----------------------------------------------
1 file changed, 2 insertions(+), 92 deletions(-)
---
diff --git a/js/ui/pageIndicators.js b/js/ui/pageIndicators.js
index 91a1ef2cfd..63a31d679c 100644
--- a/js/ui/pageIndicators.js
+++ b/js/ui/pageIndicators.js
@@ -1,27 +1,13 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported PageIndicators, AnimatedPageIndicators */
+/* exported PageIndicators */
-const { Clutter, GLib, Graphene, GObject, Meta, St } = imports.gi;
-
-const { ANIMATION_TIME_OUT, ANIMATION_MAX_DELAY_OUT_FOR_ITEM, AnimationDirection } = imports.ui.iconGrid;
+const { Clutter, Graphene, GObject, St } = imports.gi;
const INDICATOR_INACTIVE_OPACITY = 128;
const INDICATOR_INACTIVE_OPACITY_HOVER = 255;
const INDICATOR_INACTIVE_SCALE = 2 / 3;
const INDICATOR_INACTIVE_SCALE_PRESSED = 0.5;
-var INDICATORS_BASE_TIME = 250;
-var INDICATORS_BASE_TIME_OUT = 125;
-var INDICATORS_ANIMATION_DELAY = 125;
-var INDICATORS_ANIMATION_DELAY_OUT = 62.5;
-var INDICATORS_ANIMATION_MAX_TIME = 750;
-var SWITCH_TIME = 400;
-var INDICATORS_ANIMATION_MAX_TIME_OUT =
- Math.min(SWITCH_TIME,
- ANIMATION_TIME_OUT + ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
-
-var ANIMATION_DELAY = 100;
-
var PageIndicators = GObject.registerClass({
Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } },
}, class PageIndicators extends St.BoxLayout {
@@ -126,79 +112,3 @@ var PageIndicators = GObject.registerClass({
return this._nPages;
}
});
-
-var AnimatedPageIndicators = GObject.registerClass(
-class AnimatedPageIndicators extends PageIndicators {
- _init(orientation = Clutter.Orientation.VERTICAL) {
- super._init(orientation);
- this.connect('destroy', this._onDestroy.bind(this));
- }
-
- _onDestroy() {
- if (this.animateLater) {
- Meta.later_remove(this.animateLater);
- this.animateLater = 0;
- }
- }
-
- vfunc_map() {
- super.vfunc_map();
-
- // Implicit animations are skipped for unmapped actors, and our
- // children aren't mapped yet, so defer to a later handler
- this.animateLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
- this.animateLater = 0;
- this.animateIndicators(AnimationDirection.IN);
- return GLib.SOURCE_REMOVE;
- });
- }
-
- animateIndicators(animationDirection) {
- if (!this.mapped)
- return;
-
- let children = this.get_children();
- if (children.length == 0)
- return;
-
- for (let i = 0; i < this._nPages; i++)
- children[i].remove_all_transitions();
-
- const vertical = this._orientation === Clutter.Orientation.VERTICAL;
- let offset;
- if (this.get_text_direction() == Clutter.TextDirection.RTL)
- offset = vertical ? -children[0].width : -children[0].height;
- else
- offset = vertical ? children[0].width : children[0].height;
-
- let isAnimationIn = animationDirection == AnimationDirection.IN;
- let delay = isAnimationIn
- ? INDICATORS_ANIMATION_DELAY
- : INDICATORS_ANIMATION_DELAY_OUT;
- let baseTime = isAnimationIn ? INDICATORS_BASE_TIME : INDICATORS_BASE_TIME_OUT;
- let totalAnimationTime = baseTime + delay * this._nPages;
- let maxTime = isAnimationIn
- ? INDICATORS_ANIMATION_MAX_TIME
- : INDICATORS_ANIMATION_MAX_TIME_OUT;
- if (totalAnimationTime > maxTime)
- delay -= (totalAnimationTime - maxTime) / this._nPages;
-
- for (let i = 0; i < this._nPages; i++) {
- const params = {
- duration: baseTime + delay * i,
- mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
- delay: isAnimationIn ? ANIMATION_DELAY : 0,
- };
-
- if (vertical) {
- children[i].translation_x = isAnimationIn ? offset : 0;
- params.translation_x = isAnimationIn ? 0 : offset;
- } else {
- children[i].translation_y = isAnimationIn ? offset : 0;
- params.translation_y = isAnimationIn ? 0 : offset;
- }
-
- children[i].ease(params);
- }
- }
-});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]