109f39afa5
Remove setCurrentPage() function, introduce setCurrentPosition() instead, which allows to have fractional positions. Make inactive dots smaller, filled and partially transparent, as opposed to larger and fully opaque active dot. Make dots smaller overall, remove borders. Interpolate each dot between active and inactive state based on scroll position. Make it impossible to "uncheck" the active dot. Thanks Florian Müllner for parts of the code. Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/1932 https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/843
191 lines
6.9 KiB
JavaScript
191 lines
6.9 KiB
JavaScript
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
|
/* exported PageIndicators, AnimatedPageIndicators */
|
|
|
|
const { Clutter, GLib, Graphene, GObject, Meta, St } = imports.gi;
|
|
|
|
const { ANIMATION_TIME_OUT, ANIMATION_MAX_DELAY_OUT_FOR_ITEM, AnimationDirection } = imports.ui.iconGrid;
|
|
|
|
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 {
|
|
_init(orientation = Clutter.Orientation.VERTICAL) {
|
|
let vertical = orientation == Clutter.Orientation.VERTICAL;
|
|
super._init({
|
|
style_class: 'page-indicators',
|
|
vertical,
|
|
x_expand: true, y_expand: true,
|
|
x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER,
|
|
y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END,
|
|
reactive: true,
|
|
clip_to_allocation: true,
|
|
});
|
|
this._nPages = 0;
|
|
this._currentPosition = 0;
|
|
this._reactive = true;
|
|
this._reactive = true;
|
|
}
|
|
|
|
vfunc_get_preferred_height(forWidth) {
|
|
// We want to request the natural height of all our children as our
|
|
// natural height, so we chain up to St.BoxLayout, but we only request 0
|
|
// as minimum height, since it's not that important if some indicators
|
|
// are not shown
|
|
let [, natHeight] = super.vfunc_get_preferred_height(forWidth);
|
|
return [0, natHeight];
|
|
}
|
|
|
|
setReactive(reactive) {
|
|
let children = this.get_children();
|
|
for (let i = 0; i < children.length; i++)
|
|
children[i].reactive = reactive;
|
|
|
|
this._reactive = reactive;
|
|
}
|
|
|
|
setNPages(nPages) {
|
|
if (this._nPages == nPages)
|
|
return;
|
|
|
|
let diff = nPages - this._nPages;
|
|
if (diff > 0) {
|
|
for (let i = 0; i < diff; i++) {
|
|
let pageIndex = this._nPages + i;
|
|
let indicator = new St.Button({ style_class: 'page-indicator',
|
|
button_mask: St.ButtonMask.ONE |
|
|
St.ButtonMask.TWO |
|
|
St.ButtonMask.THREE,
|
|
reactive: this._reactive });
|
|
indicator.child = new St.Widget({
|
|
style_class: 'page-indicator-icon',
|
|
pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
|
|
});
|
|
indicator.connect('clicked', () => {
|
|
this.emit('page-activated', pageIndex);
|
|
});
|
|
indicator.connect('notify::hover', () => {
|
|
this._updateIndicator(indicator, pageIndex);
|
|
});
|
|
indicator.connect('notify::pressed', () => {
|
|
this._updateIndicator(indicator, pageIndex);
|
|
});
|
|
this._updateIndicator(indicator, pageIndex);
|
|
this.add_actor(indicator);
|
|
}
|
|
} else {
|
|
let children = this.get_children().splice(diff);
|
|
for (let i = 0; i < children.length; i++)
|
|
children[i].destroy();
|
|
}
|
|
this._nPages = nPages;
|
|
this.visible = this._nPages > 1;
|
|
}
|
|
|
|
_updateIndicator(indicator, pageIndex) {
|
|
let progress =
|
|
Math.max(1 - Math.abs(this._currentPosition - pageIndex), 0);
|
|
|
|
let inactiveScale = indicator.pressed
|
|
? INDICATOR_INACTIVE_SCALE_PRESSED : INDICATOR_INACTIVE_SCALE;
|
|
let inactiveOpacity = indicator.hover
|
|
? INDICATOR_INACTIVE_OPACITY_HOVER : INDICATOR_INACTIVE_OPACITY;
|
|
|
|
let scale = inactiveScale + (1 - inactiveScale) * progress;
|
|
let opacity = inactiveOpacity + (255 - inactiveOpacity) * progress;
|
|
|
|
indicator.child.set_scale(scale, scale);
|
|
indicator.child.opacity = opacity;
|
|
}
|
|
|
|
setCurrentPosition(currentPosition) {
|
|
this._currentPosition = currentPosition;
|
|
|
|
let children = this.get_children();
|
|
for (let i = 0; i < children.length; i++)
|
|
this._updateIndicator(children[i], i);
|
|
}
|
|
});
|
|
|
|
var AnimatedPageIndicators = GObject.registerClass(
|
|
class AnimatedPageIndicators extends PageIndicators {
|
|
_init() {
|
|
super._init();
|
|
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();
|
|
|
|
let offset;
|
|
if (this.get_text_direction() == Clutter.TextDirection.RTL)
|
|
offset = -children[0].width;
|
|
else
|
|
offset = children[0].width;
|
|
|
|
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++) {
|
|
children[i].translation_x = isAnimationIn ? offset : 0;
|
|
children[i].ease({
|
|
translation_x: isAnimationIn ? 0 : offset,
|
|
duration: baseTime + delay * i,
|
|
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
|
delay: isAnimationIn ? ANIMATION_DELAY : 0,
|
|
});
|
|
}
|
|
}
|
|
});
|