Merge lp:~gerboland/unity-2d/dash-ratingstars-integer-selection-only into lp:unity-2d

[Gerry Boland]

[dash] RatingStars should only allow whole stars to be selected. See bug:839759

=== modified file 'places/RatingStars.qml'
--- places/RatingStars.qml	2011-08-29 10:49:26 +0000
+++ places/RatingStars.qml	2011-09-07 13:19:27 +0000
@@ -21,7 +21,7 @@
 Item {
     id: ratingStars
 
-    property real rating: 3.7
+    property real rating
     property int size: 5 /* Number of stars */
     property alias enabled: starsMouseArea.enabled
     property alias spacing: stars.spacing
@@ -41,28 +41,11 @@
     }
 
     function incrementRating() {
-        /* Make math easier since half rating accepted */
-        var double_rating = rating * 2
-
-        if ( double_rating % 1 > 0){ /* if non-integer, round up */
-            double_rating = Math.ceil(double_rating)
-        }
-        else {
-            double_rating = clamp(double_rating+1, 0, size * 2)
-        }
-        rating = double_rating / 2
+        rating = clamp(Math.floor(rating) + 1, 1, size)
     }
 
     function decrementRating() {
-        var double_rating = rating * 2
-
-        if ( double_rating % 1 > 0){ /* if non-integer, round down */
-            double_rating = Math.ceil(double_rating)
-        }
-        else {
-            double_rating = clamp(double_rating-1, 0, size * 2)
-        }
-        rating = double_rating / 2
+        rating = clamp(Math.ceil(rating) - 1, 1, size)
     }
 
     Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
@@ -84,7 +67,12 @@
         Repeater {
             model: size
             Star {
-                fill: clamp(rating - index, 0, 1)
+                fill: if(!enabled){ /* If read-only, display any Star rating */
+                          return clamp(rating - index, 0, size)
+                      }
+                      else{ /* If user selectable, restrict to integer selections */
+                          return (rating - index > 0) ? 1 : 0
+                      }
                 iconSize: starIconSize
                 selected: ( ratingStars.activeFocus )
                 ratingVisible: ( ratingStars.ratingVisible )
@@ -105,19 +93,12 @@
         property int unitWidth: starIconSize + stars.spacing
 
         function calculateRating( posX ){
-            /* Small left-hand edge to set zero rating */
-            if( posX < 4 ) return 0
-
             /* Mouse X coordinate over one unit, relative to that unit's left edge*/
             var posXOverUnit = posX % unitWidth
 
             /* What unit is the mouse over? This is the integer part of the rating (plus one)*/
             var rating = (posX - posXOverUnit) / unitWidth + 1
 
-            /* If posX under half the star's width, remove 0.5 from the rating */
-            if( posXOverUnit <= (starIconSize/2) ){
-                rating = rating - 0.5
-            }
             return clamp( rating, 0, size )
         }