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

[Albert Astals Cid]

Move clamp to utils.js

Backport from unity-2d-shell

[Albert Astals Cid (aacid)]

Change happened here http://bazaar.launchpad.net/~unity-2d-team/unity-2d/unity-2d-shell/revision/812 From what i can see it seems it was not MR'ed and simply commited?

[Michał Sawicz (saviq)]

Please add a manual test for that.

review: Approve

[Albert Astals Cid (aacid)]

Manual test added

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

881. By Albert Astals Cid on 2012-02-03

Manual test for rating clamping

[Michał Sawicz (saviq)]

review: Approve

[Michał Sawicz (saviq)]

MR Approval awaiting lift of code freeze.

=== modified file 'places/RatingStars.qml'
--- places/RatingStars.qml	2011-11-14 10:45:33 +0000
+++ places/RatingStars.qml	2012-02-03 13:54:24 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 1.0
+import "utils.js" as Utils
 
 Item {
     id: ratingStars
@@ -36,16 +37,12 @@
     width: stars.width
     height: stars.height
 
-    function clamp(x, min, max) {
-        return Math.max(Math.min(x, max), min)
-    }
-
     function incrementRating() {
-        rating = clamp(Math.floor(rating) + 1, 1, size)
+        rating = Utils.clamp(Math.floor(rating) + 1, 1, size)
     }
 
     function decrementRating() {
-        rating = clamp(Math.ceil(rating) - 1, 1, size)
+        rating = Utils.clamp(Math.ceil(rating) - 1, 1, size)
     }
 
     Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
@@ -68,7 +65,7 @@
             model: size
             Star {
                 fill: if(!enabled){ /* If read-only, display any Star rating */
-                          return clamp(rating - index, 0, size)
+                          return Utils.clamp(rating - index, 0, size)
                       }
                       else{ /* If user selectable, restrict to integer selections */
                           return (rating - index > 0) ? 1 : 0
@@ -99,7 +96,7 @@
             /* What unit is the mouse over? This is the integer part of the rating (plus one)*/
             var rating = (posX - posXOverUnit) / unitWidth + 1
 
-            return clamp( rating, 0, size )
+            return Utils.clamp( rating, 0, size )
         }
 
         anchors.fill: stars

=== modified file 'places/utils.js'
--- places/utils.js	2011-08-24 12:44:05 +0000
+++ places/utils.js	2012-02-03 13:54:24 +0000
@@ -27,3 +27,7 @@
     }
     return camelName
 }
+
+function clamp(x, min, max) {
+    return Math.max(Math.min(x, max), min)
+}

=== modified file 'tests/manual-tests/places.txt'
--- tests/manual-tests/places.txt	2012-01-25 17:03:58 +0000
+++ tests/manual-tests/places.txt	2012-02-03 13:54:24 +0000
@@ -36,4 +36,23 @@
   #     but it does not work realiably because of the reasons explained
   #     in the places-tests.rb file
 
-----
\ No newline at end of file
+----
+
+  # Test case objectives:
+  #   * Check that filters rating is clamped
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Super
+  #   * Go to the search applications lens
+  #   * Make sure filtering is enabled
+  #   * Go to the Rating stars with the keyboard navigation
+  #   * Use Left and Right keyboard arrows to verify 1 and 5 are the maximum stars
+  #     that you can get highlighted
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+
+----