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

pointerA11yTimeout: Create new PieTimer object for each timeout

Browse Source 
Since we now put a short timeout in before the start of the actual pie
timer we don't start the timer as often as we used to. This allows us to
create a new PieTimer object each time a timeout is started and
therefore play a finish animation independently of other (new) timeouts.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/688
This commit is contained in:
Jonas Dreßler 2019-08-25 18:02:14 +02:00 committed by Olivier Fourdan
parent 5d0c403f1d
commit c2f5331187
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/ui/pointerA11yTimeout.js
View File

@ -17,6 +17,7 @@ var PieTimer = GObject.registerClass({
this._angle = 0; this._angle = 0;
super._init({ super._init({
style_class: 'pie-timer', style_class: 'pie-timer',
opacity: 0,
visible: false, visible: false,
can_focus: false, can_focus: false,
reactive: false reactive: false
@ -76,17 +77,9 @@ var PieTimer = GObject.registerClass({
} }
start(x, y, duration) { start(x, y, duration) {
this.remove_all_transitions();
this.opacity = 0;
this.x = x - this.width / 2; this.x = x - this.width / 2;
this.y = y - this.height / 2; this.y = y - this.height / 2;
this.scale_y = 1;
this.scale_x = 1;
this._angle = 0;
this.show(); this.show();
Main.uiGroup.set_child_above_sibling(this, null);
this.ease({ this.ease({
opacity: 255, opacity: 255,
@ -108,33 +101,31 @@ var PieTimer = GObject.registerClass({
opacity: 0, opacity: 0,
duration: SUCCESS_ZOOM_OUT_DURATION, duration: SUCCESS_ZOOM_OUT_DURATION,
mode: Clutter.AnimationMode.EASE_OUT_QUAD, mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onStopped: () => this.hide() onStopped: () => this.destroy()
}); });
} }
stop() {
this.remove_all_transitions();
this.hide();
}
}); });
var PointerA11yTimeout = class PointerA11yTimeout { var PointerA11yTimeout = class PointerA11yTimeout {
constructor() { constructor() {
let manager = Clutter.DeviceManager.get_default(); let manager = Clutter.DeviceManager.get_default();
let pieTimer = new PieTimer();
Main.uiGroup.add_actor(pieTimer);
manager.connect('ptr-a11y-timeout-started', (manager, device, type, timeout) => { manager.connect('ptr-a11y-timeout-started', (manager, device, type, timeout) => {
let [x, y] = global.get_pointer(); let [x, y] = global.get_pointer();
pieTimer.start(x, y, timeout);
this._pieTimer = new PieTimer();
Main.uiGroup.add_actor(this._pieTimer);
Main.uiGroup.set_child_above_sibling(this._pieTimer, null);
this._pieTimer.start(x, y, timeout);
if (type == Clutter.PointerA11yTimeoutType.GESTURE) if (type == Clutter.PointerA11yTimeoutType.GESTURE)
global.display.set_cursor(Meta.Cursor.CROSSHAIR); global.display.set_cursor(Meta.Cursor.CROSSHAIR);
}); });
manager.connect('ptr-a11y-timeout-stopped', (manager, device, type, clicked) => { manager.connect('ptr-a11y-timeout-stopped', (manager, device, type, clicked) => {
if (!clicked) if (!clicked)
pieTimer.stop(); this._pieTimer.destroy();
if (type == Clutter.PointerA11yTimeoutType.GESTURE) if (type == Clutter.PointerA11yTimeoutType.GESTURE)
global.display.set_cursor(Meta.Cursor.DEFAULT); global.display.set_cursor(Meta.Cursor.DEFAULT);