Merge lp:~aacid/unity-2d/tooltip_mm_rtl into lp:unity-2d

[Albert Astals Cid]

[Launcher] Fix tile tooltip position on RTL MM setups

Fix launcher tile tooltip position on RTL MM setups
UNBLOCK

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in tests/manual-tests/launcher.txt

[lp:~aacid/unity-2d/tooltip_mm_rtl]

1072. By Albert Astals Cid on 2012-04-19

Merge lp:unity-2d

=== modified file 'libunity-2d-private/src/launchermenu.cpp'
--- libunity-2d-private/src/launchermenu.cpp	2012-03-08 19:10:11 +0000
+++ libunity-2d-private/src/launchermenu.cpp	2012-04-19 11:55:24 +0000
@@ -175,7 +175,7 @@
     m_arrowY = 6;
 
     if (QApplication::isRightToLeft()) {
-        x = QApplication::desktop()->width() - x - sizeHint().width();
+        x -= sizeHint().width();
     }
 
     move(x, y - sizeHint().height() / 2 );

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-04-16 15:26:55 +0000
+++ shell/launcher/LauncherList.qml	2012-04-19 11:55:24 +0000
@@ -163,7 +163,15 @@
                 list.visibleMenu.hide()
             }
             list.visibleMenu = item.menu
-            item.menu.show(declarativeView.globalPosition.x + width, declarativeView.globalPosition.y + list.y - list.contentY +
+
+            var xPos
+            if (Utils.isLeftToRight()) {
+                xPos = declarativeView.globalPosition.x + width
+            } else {
+                // We need to substract the menu width too, that's done inside show() itself
+                xPos = declarativeView.globalPosition.x + declarativeView.width - width
+            }
+            item.menu.show(xPos, declarativeView.globalPosition.y + list.y - list.contentY +
                                   y + height - selectionOutlineSize / 2)
         }
 

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-19 11:17:53 +0000
+++ tests/manual-tests/launcher.txt	2012-04-19 11:55:24 +0000
@@ -131,6 +131,12 @@
 Verify that the tile that appears in the launcher has the app icon and not the questionmark icon
 ----
 
+ * Have a multimonitor setup
+ * Run unity-2d-shell in RTL
+ * Have launchers in both screens
+
+Verify that the tile tooltips appear in the correct screen
+----
  * Alt+f1 to show launcher
  * move down with arrow key
  * press enter to start/focus a program (firefox works particulary well due to its red background)