Merge lp:~aacid/unity-2d/unity-2d-shell_rtl_fixed_launcher into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

[shell] Fix launcher position in always visible mode for RTL

[Florian Boucault (fboucault)]

Functionally works.

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-08 10:55:20 +0000
+++ shell/Shell.qml	2012-02-08 11:51:20 +0000
@@ -40,7 +40,7 @@
             if (Utils.isLeftToRight()) {
                 return visibilityController.shown ? 0 : -width
             } else {
-                return visibilityController.shown ? declarativeView.screen.availableGeometry.width - width : declarativeView.screen.availableGeometry.width
+                return visibilityController.shown ? shell.width - width : shell.width
             }
         }
 
@@ -83,7 +83,7 @@
         id: dashLoader
         source: "dash/Dash.qml"
         anchors.top: parent.top
-        x: Utils.isLeftToRight() ? launcherLoader.width : declarativeView.screen.availableGeometry.width - width - launcherLoader.width
+        x: Utils.isLeftToRight() ? launcherLoader.width : shell.width - width - launcherLoader.width
         onLoaded: item.focus = true
         opacity: item.active ? 1.0 : 0.0
         focus: item.active
@@ -127,7 +127,7 @@
             rectangle: {
                 // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
                 //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
-                var somewhatShown = Utils.isLeftToRight() ? -launcherLoader.x < launcherLoader.width : launcherLoader.x < declarativeView.screen.availableGeometry.width
+                var somewhatShown = Utils.isLeftToRight() ? -launcherLoader.x < launcherLoader.width : launcherLoader.x < shell.width
                 if (somewhatShown) {
                     return Qt.rect(launcherLoader.x,
                                    launcherLoader.y,