From 11215374ff980355d5fef28b0f3d78f072d2af8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 3 Jul 2013 11:52:21 +0200 Subject: [PATCH] lookingGlass: Use uiGroup as parent instead of panelBox Currently lookingGlass relies on some odd BoxLayout behavior, which allows children to use fixed positioning without affecting the parent's size request. As this behavior is scheduled for removal, add the looking glass dialog directly to Main.uiGroup. https://bugzilla.gnome.org/show_bug.cgi?id=703808 --- js/ui/lookingGlass.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js index b5b3bfe09..98e6addde 100644 --- a/js/ui/lookingGlass.js +++ b/js/ui/lookingGlass.js @@ -849,8 +849,9 @@ const LookingGlass = new Lang.Class({ this._updateFont(); // We want it to appear to slide out from underneath the panel - Main.layoutManager.panelBox.add_actor(this.actor); - this.actor.lower_bottom(); + Main.uiGroup.add_actor(this.actor); + Main.uiGroup.set_child_below_sibling(this.actor, + Main.layoutManager.panelBox); Main.layoutManager.panelBox.connect('allocation-changed', Lang.bind(this, this._queueResize)); Main.layoutManager.keyboardBox.connect('allocation-changed', @@ -1072,7 +1073,7 @@ const LookingGlass = new Lang.Class({ let availableHeight = primary.height - Main.layoutManager.keyboardBox.height; let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9); this.actor.x = (primary.width - myWidth) / 2; - this._hiddenY = this.actor.get_parent().height - myHeight - 4; // -4 to hide the top corners + this._hiddenY = Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners this._targetY = this._hiddenY + myHeight; this.actor.y = this._hiddenY; this.actor.width = myWidth;