cleanup: Rename signals/methods that will conflict with Clutter.Actor
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559
This commit is contained in:

committed by
Florian Müllner

parent
ab6a629955
commit
0353a5bf2c
@ -116,6 +116,7 @@ var Lightbox = class Lightbox {
|
||||
radialEffect: false,
|
||||
});
|
||||
|
||||
this._active = false;
|
||||
this._container = container;
|
||||
this._children = container.get_children();
|
||||
this._fadeFactor = params.fadeFactor;
|
||||
@ -131,7 +132,6 @@ var Lightbox = class Lightbox {
|
||||
container.add_actor(this.actor);
|
||||
this.actor.raise_top();
|
||||
this.actor.hide();
|
||||
this.shown = false;
|
||||
|
||||
this.actor.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
@ -150,6 +150,10 @@ var Lightbox = class Lightbox {
|
||||
this._highlighted = null;
|
||||
}
|
||||
|
||||
get active() {
|
||||
return this._active;
|
||||
}
|
||||
|
||||
_actorAdded(container, newChild) {
|
||||
let children = this._container.get_children();
|
||||
let myIndex = children.indexOf(this.actor);
|
||||
@ -172,7 +176,7 @@ var Lightbox = class Lightbox {
|
||||
}
|
||||
}
|
||||
|
||||
show(fadeInTime) {
|
||||
lightOn(fadeInTime) {
|
||||
this.actor.remove_all_transitions();
|
||||
|
||||
let easeProps = {
|
||||
@ -181,8 +185,8 @@ var Lightbox = class Lightbox {
|
||||
};
|
||||
|
||||
let onComplete = () => {
|
||||
this.shown = true;
|
||||
this.emit('shown');
|
||||
this._active = true;
|
||||
this.emit('active-changed');
|
||||
};
|
||||
|
||||
this.actor.show();
|
||||
@ -201,10 +205,12 @@ var Lightbox = class Lightbox {
|
||||
}
|
||||
}
|
||||
|
||||
hide(fadeOutTime) {
|
||||
this.shown = false;
|
||||
lightOff(fadeOutTime) {
|
||||
this.actor.remove_all_transitions();
|
||||
|
||||
this._active = false;
|
||||
this.emit('active-changed');
|
||||
|
||||
let easeProps = {
|
||||
duration: fadeOutTime || 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
|
Reference in New Issue
Block a user