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

[Albert Astals Cid]

[shell] Update pips if the geometry of the screen we are on changes which probably means our physical screen

Update pips if the geometry of the screen we are changes

Which might mean our physhical screen changed

[Gerry Boland (gerboland)]

Well the obvious problem I see with this is if you have 2 screens with identical resolutions. Can we not watch the screen number?

review: Needs Information

[Albert Astals Cid (aacid)]

Maybe you did not understand the problem in the test.

I start with this setup

Screen 0: Pos:0,0 Resolution: 1920x1080

Now i add a new monitor, that monitor is on the right and configured to be the primary monitor, after plugin i have

Screen 0: Pos:1920,0 Resolution: 1920x1080
Screen 1: Pos:0,0 Resolution: 1920x1080

As you can see, the geometry of Screen 0 changed, thus i need to update its pips since the windows that were in that launcher screen aren't there anymore

[Gerry Boland (gerboland)]

I mis-understood. Yep your fix covers that problem perfectly. Approving!

review: Approve

[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/update_pips_on_shell_monitor_reshuffle]

1104. By Albert Astals Cid on 2012-05-25

Merge lp:unity-2d

1105. By Albert Astals Cid on 2012-05-25

Fix merging minor issue

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-04-25 09:43:11 +0000
+++ shell/launcher/LauncherList.qml	2012-05-25 07:24:18 +0000
@@ -391,6 +391,10 @@
             target: shellManager
             onActiveWorkspaceChanged: updatePips()
         }
+        Connections {
+            target: declarativeView.screen
+            onGeometryChanged: updatePips()
+        }
         Component.onCompleted: updatePips()
     }
 }

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-05-24 08:33:50 +0000
+++ tests/manual-tests/launcher.txt	2012-05-25 07:24:18 +0000
@@ -176,6 +176,13 @@
 
 Verify the launcher hides
 ----
+ * Have a two monitor setup in which the second monitor becomes screen 0 when plugged
+ * Start unity-2d-shell with only one monitor plugged
+ * Start a program
+ * Plug in the second monitor (which will become screen 0)
+
+Verify the launcher of that second monitor does not show if the program we started (and still is) on the first monitor was in that screen
+----
  * Plug an external device
  * Make it busy (e.g. go to it in a terminal)
  * Try to safe eject the device