Merge lp:~robertcarr/unity/ratingswidget-fixdesign into lp:unity

[Robert Carr]

Update the filter ratings widget to fit design. Firstly the user should not be able to set half stars. Secondly the user should be able to drag and change the star rating

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2011-09-15 02:09:12 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2011-09-26 14:07:29 +0000
@@ -24,6 +24,8 @@
 #include <Nux/Nux.h>
 #include <NuxCore/Logger.h>
 
+#include <math.h>
+
 #include "FilterRatingsButton.h"
 #include "DashStyle.h"
 
@@ -47,7 +49,8 @@
   {
     InitTheme();
 
-    mouse_down.connect (sigc::mem_fun (this, &FilterRatingsButton::RecvMouseDown) );
+    mouse_up.connect (sigc::mem_fun (this, &FilterRatingsButton::RecvMouseUp) );
+    mouse_drag.connect (sigc::mem_fun (this, &FilterRatingsButton::RecvMouseDrag) );
   }
 
   FilterRatingsButton::~FilterRatingsButton() {
@@ -148,9 +151,16 @@
     int rating = 5;
     if (filter_ != NULL)
       rating = filter_->rating * 10;
-    int total_full_stars = rating / 2;
-    int total_half_stars = rating % 2;
-
+    // FIXME: 9/26/2011
+    // We should probably support an API for saying whether the ratings
+    // should or shouldn't support half stars...but our only consumer at
+    // the moment is the applications lens which according to design
+    // (Bug #839759) shouldn't. So for now just force rounding.
+    //    int total_half_stars = rating % 2;
+    //    int total_full_stars = rating / 2;
+    int total_full_stars = ceil (rating / 2.0);
+    int total_half_stars = 0;
+    
     nux::Geometry geometry = GetGeometry ();
     //geometry.width = geometry.width / 5;
     geometry.width = 27;
@@ -227,13 +237,28 @@
   void FilterRatingsButton::PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {
     nux::Button::PostDraw(GfxContext, force_draw);
   }
-
-  void FilterRatingsButton::RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags) {
-    //int width = GetGeometry().width;
+  
+  static void _UpdateRatingToMouse (dash::RatingsFilter::Ptr filter, int x)
+  {
     int width = 180;
     float new_rating = (static_cast<float>(x) / width) + 0.10f;
-    if (filter_ != NULL)
-      filter_->rating = new_rating;
+
+    new_rating = ceil(10*new_rating)/10;
+    
+    if (filter != NULL)
+      filter->rating = new_rating;    
+  }
+
+  void FilterRatingsButton::RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags) 
+  {
+    _UpdateRatingToMouse (filter_, x);
+  }
+
+  void FilterRatingsButton::RecvMouseDrag (int x, int y, int dx, int dy, 
+					   unsigned long button_flags, 
+					   unsigned long key_flags)
+  {
+    _UpdateRatingToMouse (filter_, x);
   }
 
   void FilterRatingsButton::OnRatingsChanged (int rating) {

=== modified file 'plugins/unityshell/src/FilterRatingsButton.h'
--- plugins/unityshell/src/FilterRatingsButton.h	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/FilterRatingsButton.h	2011-09-26 14:07:29 +0000
@@ -52,6 +52,8 @@
     void InitTheme ();
 
     void RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags);
+    void RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags);
+    void RecvMouseDrag (int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
     void OnRatingsChanged (int rating);
 
     nux::CairoWrapper *prelight_empty_;