From aa3caff7143916e9e63cd9dae13e54be7b861c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 10 Oct 2014 10:58:42 +0200 Subject: [PATCH] overviewControls: Really fix x align Commit a4475465f1f2 fixed the wrong alignment for the fully visible control, but regressed the partially slid-out one; take the slideX factor into account to get the right offset for both cases. --- js/ui/overviewControls.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js index 5dd2be4ae..b5f60de05 100644 --- a/js/ui/overviewControls.js +++ b/js/ui/overviewControls.js @@ -64,7 +64,8 @@ const SlideLayout = new Lang.Class({ // flags only determine what to do if the allocated box is bigger // than the actor's box. let realDirection = getRtlSlideDirection(this._direction, child); - let alignX = (realDirection == SlideDirection.RIGHT) ? (availWidth - natWidth) : 0; + let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth) + : (availWidth - natWidth * this._slideX); let actorBox = new Clutter.ActorBox(); actorBox.x1 = box.x1 + alignX + this._translationX;