Merge lp:~stolowski/unity-2d/dash-always-fullscreen-fix into lp:unity-2d

[Paweł Stołowski]

[dash] Properly handle always-fullscreen flag, forcing fullscreen mode on small screens: bind to shellManager.dashAlwaysFullScreen, not shellManager.alwaysFullscreen.

[Albert Astals Cid (aacid)]

Thanks for fixing my typo :-)

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-03-20 14:50:42 +0000
+++ shell/dash/Dash.qml	2012-03-30 14:13:26 +0000
@@ -69,7 +69,7 @@
     Binding {
         target: shellManager
         property: "dashMode"
-        value: shellManager.alwaysFullScreen || dash2dConfiguration.fullScreen ?
+        value: shellManager.dashAlwaysFullScreen || dash2dConfiguration.fullScreen ?
                ShellManager.FullScreenMode : ShellManager.DesktopMode
     }
 
 
=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-03-29 15:59:53 +0000
+++ tests/manual-tests/dash.txt	2012-03-30 14:13:26 +0000
@@ -86,3 +86,16 @@
   #   * Verify there is no graphic noise left on screen
 
 ----
+  # Test case objectives:
+  #   * Check that dash fullscreen mode is forced on small screens
+  # Pre-conditions
+  #   * Small screen (anything less than 1280x1084), e.g. 1024x768
+  #   * form-factor dconf option set to "desktop"
+  #   * full-screen dconf option for dash is unset
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Super
+  #   * Verify dash is showing maximized
+  #   * Verify that pressing dash maximize button has no effect (dash stays in maximized mode).
+
+----