Merge lp:~mhr3/unity/bug-865482 into lp:unity

[Michal Hruby]

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2011-10-03 13:07:36 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2011-10-04 11:15:20 +0000
@@ -148,9 +148,9 @@
   }
 
   void FilterRatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
-    int rating = 5;
-    if (filter_ != NULL)
-      rating = filter_->rating * 10;
+    int rating = 0;
+    if (filter_ != NULL && filter_->filtering)
+      rating = static_cast<int>(filter_->rating * 5);
     // 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
@@ -158,7 +158,7 @@
     // (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_full_stars = rating;
     int total_half_stars = 0;
     
     nux::Geometry geometry = GetGeometry ();
@@ -241,13 +241,14 @@
   static void _UpdateRatingToMouse (dash::RatingsFilter::Ptr filter, int x)
   {
     int width = 180;
-    float new_rating = (static_cast<float>(x) / width) + 0.10f;
+    float new_rating = (static_cast<float>(x) / width);
 
-    new_rating = ceil(10*new_rating)/10;
+    // FIXME: change to 10 once we decide to support also half-stars
+    new_rating = ceil(5*new_rating)/5;
     new_rating = new_rating > 1 ? 1 : (new_rating < 0 ? 0 : new_rating);
     
     if (filter != NULL)
-      filter->rating = new_rating;    
+      filter->rating = new_rating;
   }
 
   void FilterRatingsButton::RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags) 
 
=== modified file 'plugins/unityshell/src/FilterRatingsWidget.cpp'
--- plugins/unityshell/src/FilterRatingsWidget.cpp	2011-09-12 08:44:54 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.cpp	2011-10-04 11:15:20 +0000
@@ -38,7 +38,8 @@
 NUX_IMPLEMENT_OBJECT_TYPE(FilterRatingsWidget);
 
   FilterRatingsWidget::FilterRatingsWidget (NUX_FILE_LINE_DECL)
-      : FilterExpanderLabel (_("Rating"), NUX_FILE_LINE_PARAM)
+      : FilterExpanderLabel (_("Rating"), NUX_FILE_LINE_PARAM),
+        last_rating_ (0.0f)
   {
     any_button_ = new FilterBasicButton(_("All"), NUX_TRACKER_LOCATION);
     any_button_->activated.connect(sigc::mem_fun(this, &FilterRatingsWidget::OnAnyButtonActivated));
@@ -59,12 +60,36 @@
 
   void FilterRatingsWidget::OnAnyButtonActivated(nux::View *view)
   {
-    filter_->Clear();
+    if (any_button_->active)
+    {
+      last_rating_ = filter_->rating;
+      // we need to make sure the property changes, otherwise there'll be no
+      // signals, so we'll set it to 0.0f
+      filter_->rating = 0.0f;
+      filter_->Clear();
+    }
+    else
+    {
+      filter_->rating = last_rating_;
+    }
+  }
+
+  void FilterRatingsWidget::OnFilterRatingChanged(float new_rating)
+  {
+    if (new_rating <= 0.0f)
+    {
+      any_button_->active = true;
+    }
+    else
+    {
+      any_button_->active = false;
+    }
   }
 
   void FilterRatingsWidget::SetFilter (dash::Filter::Ptr filter)
   {
     filter_ = std::static_pointer_cast<dash::RatingsFilter>(filter);
+    filter_->rating.changed.connect (sigc::mem_fun (this, &FilterRatingsWidget::OnFilterRatingChanged));
     ratings_->SetFilter(filter);
     SetLabel(filter_->name);
     NeedRedraw();
 
=== modified file 'plugins/unityshell/src/FilterRatingsWidget.h'
--- plugins/unityshell/src/FilterRatingsWidget.h	2011-09-12 03:57:01 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.h	2011-10-04 11:15:20 +0000
@@ -57,7 +57,7 @@
     virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
     void OnRatingsRatingChanged(const int& new_rating);
-    void OnFilterRatingChanged(const int& new_rating);
+    void OnFilterRatingChanged(float new_rating);
     void OnAnyButtonActivated(nux::View *view);
 
     FilterBasicButton *any_button_;
@@ -65,6 +65,7 @@
     dash::RatingsFilter::Ptr filter_;
 
   private:
+    float last_rating_;
   };
 
 }