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

animation: Add parameter for hiding stopped Spinner actor

Browse Source 
Not hiding leaves the empty actor space visible, which may have an
undesirable effect on the parent element's size or spacing/padding.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/834
This commit is contained in:
Joonas Henriksson 2019-11-18 22:24:05 +02:00
parent 96ac00b53c
commit e257be64d0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/animation.js
View File

@ -140,12 +140,15 @@ var Spinner = class extends AnimatedIcon {
params = Params.parse(params, { params = Params.parse(params, {
animate: false, animate: false,
hideOnStop: false,
}); });
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg'); let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
super(file, size); super(file, size);
this.actor.opacity = 0; this.actor.opacity = 0;
this._animate = params.animate; this._animate = params.animate;
this._hideOnStop = params.hideOnStop;
this.actor.visible = !this._hideOnStop;
} }
_onDestroy() { _onDestroy() {
@ -155,6 +158,7 @@ var Spinner = class extends AnimatedIcon {
play() { play() {
this.actor.remove_all_transitions(); this.actor.remove_all_transitions();
this.actor.show();
if (this._animate) { if (this._animate) {
super.play(); super.play();
@ -178,11 +182,18 @@ var Spinner = class extends AnimatedIcon {
opacity: 0, opacity: 0,
duration: SPINNER_ANIMATION_TIME, duration: SPINNER_ANIMATION_TIME,
mode: Clutter.AnimationMode.LINEAR, mode: Clutter.AnimationMode.LINEAR,
onComplete: () => super.stop() onComplete: () => {
super.stop();
if (this._hideOnStop)
this.actor.hide();
},
}); });
} else { } else {
this.actor.opacity = 0; this.actor.opacity = 0;
super.stop(); super.stop();
if (this._hideOnStop)
this.actor.hide();
} }
} }
}; };