[gnome-shell] modalDialog: Always use a stack for the background
- From: Florian MĂźllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] modalDialog: Always use a stack for the background
- Date: Tue, 7 May 2013 18:53:20 +0000 (UTC)
commit e98eb57e3e8b830b75d27cb067d4d53eda2f1603
Author: Florian MĂźllner <fmuellner gnome org>
Date: Sat Mar 23 00:39:05 2013 +0100
modalDialog: Always use a stack for the background
Currently a system modal dialog's actor hierarchy depends on whether
events should be blocked while the dialog is shown or not. Change
it to always contain a stack, to allow subclasses to add additional
background elements.
https://bugzilla.gnome.org/show_bug.cgi?id=694912
js/ui/modalDialog.js | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index beac7fe..84c5c3b 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -65,7 +65,9 @@ const ModalDialog = new Lang.Class({
this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));
- this._backgroundBin = new St.Bin();
+ this.backgroundStack = new Shell.Stack();
+ this._backgroundBin = new St.Bin({ child: this.backgroundStack,
+ x_fill: true, y_fill: true });
this._monitorConstraint = new Layout.MonitorConstraint();
this._backgroundBin.add_constraint(this._monitorConstraint);
this._group.add_actor(this._backgroundBin);
@@ -81,15 +83,10 @@ const ModalDialog = new Lang.Class({
{ inhibitEvents: true });
this._lightbox.highlight(this._backgroundBin);
- let stack = new Shell.Stack();
- this._backgroundBin.child = stack;
-
this._eventBlocker = new Clutter.Actor({ reactive: true });
- stack.add_actor(this._eventBlocker);
- stack.add_actor(this.dialogLayout);
- } else {
- this._backgroundBin.child = this.dialogLayout;
+ this.backgroundStack.add_actor(this._eventBlocker);
}
+ this.backgroundStack.add_actor(this.dialogLayout);
this.contentLayout = new St.BoxLayout({ vertical: true });
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]