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

ModalDialog: make dialogLayout public

Browse Source 
ModalDialog subclasses may want to add content outside contentLayout
(in particular, UnlockDialog wants to have it after the buttons)
This commit is contained in:
Giovanni Campagna 2012-08-07 20:33:46 +02:00
parent d11027e8c8
commit 5a35c57866
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/modalDialog.js
View File

@ -61,10 +61,10 @@ const ModalDialog = new Lang.Class({
this._backgroundBin = new St.Bin(); this._backgroundBin = new St.Bin();
this._group.add_actor(this._backgroundBin); this._group.add_actor(this._backgroundBin);
this._dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog', this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
vertical: true }); vertical: true });
if (params.styleClass != null) { if (params.styleClass != null) {
this._dialogLayout.add_style_class_name(params.styleClass); this.dialogLayout.add_style_class_name(params.styleClass);
} }
if (!this._shellReactive) { if (!this._shellReactive) {
@ -77,14 +77,14 @@ const ModalDialog = new Lang.Class({
this._eventBlocker = new Clutter.Group({ reactive: true }); this._eventBlocker = new Clutter.Group({ reactive: true });
stack.add_actor(this._eventBlocker); stack.add_actor(this._eventBlocker);
stack.add_actor(this._dialogLayout); stack.add_actor(this.dialogLayout);
} else { } else {
this._backgroundBin.child = this._dialogLayout; this._backgroundBin.child = this.dialogLayout;
} }
this.contentLayout = new St.BoxLayout({ vertical: true }); this.contentLayout = new St.BoxLayout({ vertical: true });
this._dialogLayout.add(this.contentLayout, this.dialogLayout.add(this.contentLayout,
{ x_fill: true, { x_fill: true,
y_fill: true, y_fill: true,
x_align: St.Align.MIDDLE, x_align: St.Align.MIDDLE,
@ -93,13 +93,13 @@ const ModalDialog = new Lang.Class({
this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box', this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
visible: false, visible: false,
vertical: false }); vertical: false });
this._dialogLayout.add(this._buttonLayout, this.dialogLayout.add(this._buttonLayout,
{ expand: true, { expand: true,
x_align: St.Align.MIDDLE, x_align: St.Align.MIDDLE,
y_align: St.Align.END }); y_align: St.Align.END });
global.focus_manager.add_group(this._dialogLayout); global.focus_manager.add_group(this.dialogLayout);
this._initialKeyFocus = this._dialogLayout; this._initialKeyFocus = this.dialogLayout;
this._initialKeyFocusDestroyId = 0; this._initialKeyFocusDestroyId = 0;
this._savedKeyFocus = null; this._savedKeyFocus = null;
}, },
@ -203,7 +203,7 @@ const ModalDialog = new Lang.Class({
this.state = State.OPENING; this.state = State.OPENING;
this._dialogLayout.opacity = 255; this.dialogLayout.opacity = 255;
if (this._lightbox) if (this._lightbox)
this._lightbox.show(); this._lightbox.show();
this._group.opacity = 0; this._group.opacity = 0;
@ -227,7 +227,7 @@ const ModalDialog = new Lang.Class({
this._initialKeyFocus = actor; this._initialKeyFocus = actor;
this._initialKeyFocusDestroyId = actor.connect('destroy', Lang.bind(this, function() { this._initialKeyFocusDestroyId = actor.connect('destroy', Lang.bind(this, function() {
this._initialKeyFocus = this._dialogLayout; this._initialKeyFocus = this.dialogLayout;
this._initialKeyFocusDestroyId = 0; this._initialKeyFocusDestroyId = 0;
})); }));
}, },
@ -320,7 +320,7 @@ const ModalDialog = new Lang.Class({
return; return;
this.popModal(timestamp); this.popModal(timestamp);
Tweener.addTween(this._dialogLayout, Tweener.addTween(this.dialogLayout,
{ opacity: 0, { opacity: 0,
time: FADE_OUT_DIALOG_TIME, time: FADE_OUT_DIALOG_TIME,
transition: 'easeOutQuad', transition: 'easeOutQuad',