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

[Albert Astals Cid]

[Launcher] Add the corner reveal option

[Launcher] Add the corner reveal option

[Unity Merger (unity-merger)]

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

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2012-03-22 11:08:54 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-04-04 13:03:24 +0000
@@ -41,6 +41,14 @@
         2: intellihide; same as auto hide but the launcher will disappear if a window is placed on top of it
        </description>
     </key>
+    <key type="i" name="reveal-mode">
+      <default>0</default>
+      <summary>Reveal mode</summary>
+      <description>Possible values:
+        0: Reveal the launcher by pushing the mouse against the left side of the screen (right in RTL)
+        1: Reveal the launcher by pushing the mouse against the top-left corner of the screen (top-right in RTL)
+       </description>
+    </key>
     <key name="edge-responsiveness" type="d">
       <default>2</default>
       <summary>Responsiveness of the Launcher</summary>

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-04-04 00:25:35 +0000
+++ shell/Shell.qml	2012-04-04 13:03:24 +0000
@@ -285,8 +285,8 @@
         triggerOnly: enableTrigger && !enableSticky
         p1: Qt.point(x, declarativeView.screen.geometry.y)
         p2: Qt.point(x, declarativeView.screen.geometry.y + declarativeView.screen.geometry.height)
-        triggerZoneP1: Qt.point(x, declarativeView.globalPosition.y)
-        triggerZoneP2: Qt.point(x, declarativeView.globalPosition.y + launcherLoader.height)
+        triggerZoneP1: Qt.point(x, launcher2dConfiguration.revealMode == 1 ? declarativeView.screen.geometry.y : declarativeView.globalPosition.y)
+        triggerZoneP2: Qt.point(x, launcher2dConfiguration.revealMode == 1 ? declarativeView.screen.geometry.y + 1 : declarativeView.globalPosition.y + launcherLoader.height)
         threshold: (enableSticky || enableTrigger) ? launcher2dConfiguration.edgeStopVelocity : -1
         maxVelocityMultiplier: launcher2dConfiguration.edgeResponsiveness
         decayRate: launcher2dConfiguration.edgeDecayrate

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-03-30 13:44:54 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-04-04 13:03:24 +0000
@@ -33,6 +33,7 @@
 context "Launcher Autohide and Show Tests" do
   launcher_favorites = ""
   hide_mode = 0
+  reveal_mode = false
 
   def verify_launcher_visible(timeout, message = '')
     verify_equal( 0, timeout, message ) {
@@ -55,6 +56,10 @@
     XDo::Mouse.move(0, 200, 0, true)
   end
 
+  def move_mouse_to_screen_corner()
+    XDo::Mouse.move(0, 0, 0, true)
+  end
+
   def mouse_push_screen_edge
     (1..100).each do |i|
       $SUT.execute_shell_command 'xdotool mousemove_relative -- -10 0'
@@ -83,10 +88,14 @@
     $SUT.execute_shell_command 'killall unity-2d-shell'
 
     hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    reveal_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher reveal-mode'
     
     # Set hide mode to intellihide
     $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
 
+    # Set reveal mode to side
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher reveal-mode 0'
+
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
   end
@@ -94,6 +103,7 @@
   # Run once at the end of this test suite
   shutdown do
     $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher reveal-mode ' + reveal_mode
   end
 
   # Run before each test case begins
@@ -203,4 +213,8 @@
     test_auto_hide_launcher_mouse_move_just_after_barrier_trigger()
   end
 
+  test "Auto Hide: Launcher mouse corner reveal" do
+    test_auto_hide_launcher_mouse_corner_reveal()
+  end
+
 end

=== modified file 'tests/launcher/autohide_show_tests_common.rb'
--- tests/launcher/autohide_show_tests_common.rb	2012-03-30 13:44:54 +0000
+++ tests/launcher/autohide_show_tests_common.rb	2012-04-04 13:03:24 +0000
@@ -647,3 +647,39 @@
   XDo::Mouse.move(300, 300, 0, true)
   verify_launcher_hidden(TIMEOUT, 'Launcher should not be visible after moving the mouse away')
 end
+
+# Test case objectives:
+# * Auto Hide: Launcher reveal with mouse on the corner
+# Pre-conditions
+# * Desktop with no running applications
+# Test steps
+# * Set hide-mode to 1
+# * Set reveal-mode to 1
+# * Move mouse away from launcher
+# * Verify Launcher hides
+# * Move mouse to screen edge
+# * Verify Launcher still hiding
+# * Press the edge
+# * Verify Launcher still hiding
+# * Move mouse to screen corner
+# * Verify Launcher still hiding
+# * Press the corner
+# * Verify Launcher shows
+# Post-conditions
+# * None
+# References
+# * None
+def test_auto_hide_launcher_mouse_corner_reveal
+  $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 1'
+  $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher reveal-mode 1'
+  XDo::Mouse.move(300, 300, 0, true)
+  verify_launcher_hidden(TIMEOUT, 'Launcher should not be visible immediately without pushing the edge')
+  move_mouse_to_screen_edge()
+  verify_launcher_hidden(0, 'Launcher should not be visible immediately without pushing the corner')
+  mouse_push_screen_edge()
+  verify_launcher_hidden(2, 'Launcher should not be visible by pushing the edge on corner-reveal enabled')
+  move_mouse_to_screen_corner()
+  verify_launcher_hidden(0, 'Launcher should not be visible immediately without pushing the corner')
+  mouse_push_screen_edge()
+  verify_launcher_visible(TIMEOUT, 'Launcher hidden, should be visible')
+end

=== modified file 'tests/launcher/autohide_show_tests_rtl.rb'
--- tests/launcher/autohide_show_tests_rtl.rb	2012-03-30 13:44:54 +0000
+++ tests/launcher/autohide_show_tests_rtl.rb	2012-04-04 13:03:24 +0000
@@ -33,6 +33,7 @@
 context "Launcher Autohide and Show Tests on RTL" do
   launcher_favorites = ""
   hide_mode = 0
+  reveal_mode = false
 
   def verify_launcher_visible(timeout, message = '')
     verify_equal( XDo::XWindow.display_geometry[0] - LAUNCHER_WIDTH, timeout, message ) {
@@ -56,6 +57,10 @@
     XDo::Mouse.move(XDo::XWindow.display_geometry[0], 200, 0, true)
   end
 
+  def move_mouse_to_screen_corner()
+    XDo::Mouse.move(XDo::XWindow.display_geometry[0], 0, 0, true)
+  end
+
   def mouse_push_screen_edge
     (1..100).each do |i|
       $SUT.execute_shell_command 'xdotool mousemove_relative 10 0'
@@ -84,10 +89,14 @@
     $SUT.execute_shell_command 'killall unity-2d-shell'
 
     hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    reveal_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher reveal-mode'
     
     # Set hide mode to intellihide
     $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
 
+    # Set reveal mode to side
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher reveal-mode 0'
+
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
   end
@@ -95,6 +104,7 @@
   # Run once at the end of this test suite
   shutdown do
     $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher reveal-mode ' + reveal_mode
   end
 
   # Run before each test case begins
@@ -204,4 +214,8 @@
     test_auto_hide_launcher_mouse_move_just_after_barrier_trigger()
   end
 
+  test "Auto Hide: Launcher mouse corner reveal" do
+    test_auto_hide_launcher_mouse_corner_reveal()
+  end
+
 end