From f5a9dbb348632864095179f5f88a6fef9707e7c7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 18 Sep 2013 19:29:30 -0400 Subject: [PATCH] overviewControls: Always allocate the actor its full size This is the new Clutter way -- if the actor wants to adjust its alignment, it will do it itself with its alignment flags. --- js/ui/overviewControls.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js index 7e1f6a258..a1d99e68c 100644 --- a/js/ui/overviewControls.js +++ b/js/ui/overviewControls.js @@ -67,7 +67,7 @@ const SlideLayout = new Lang.Class({ let actorBox = new Clutter.ActorBox(); actorBox.x1 = box.x1 + alignX; - actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth; + actorBox.x2 = actorBox.x1 + availWidth; actorBox.y1 = box.y1; actorBox.y2 = actorBox.y1 + availHeight; @@ -314,11 +314,6 @@ const DashSlider = new Lang.Class({ this._dash = dash; - // SlideLayout reads the actor's expand flags to decide - // whether to allocate the natural size to its child, or the whole - // available allocation - this._dash.actor.x_expand = true; - this.actor.x_expand = true; this.actor.x_align = Clutter.ActorAlign.START; this.actor.y_expand = true;