Merge lp:~nick-dedekind/unity/preview.lp1043997-music-tracks into lp:unity

[Nick Dedekind]

Extended track play/pause mouse discovery for entire track row.
Re-worded manual test for play/pause music track.

Extended track play/pause mouse discovery for entire track row.
Re-worded manual test for play/pause music track.

[Brandon Schaefer (brandontschaefer)]

Looks good code wise. Though the only problem I see is when you re-open the dash the music stops playing. I would think it would continue to play independent of the dash opening/closing. Though im not sure how easy of a fix that will be...if it is large enough we should merge this part, then open a new bug to work that part. Let me know what you think!

[Michal Hruby (mhr3)]

> Looks good code wise. Though the only problem I see is when you re-open the
> dash the music stops playing. I would think it would continue to play
> independent of the dash opening/closing. Though im not sure how easy of a fix
> that will be...if it is large enough we should merge this part, then open a
> new bug to work that part. Let me know what you think!

According to design the preview needs to stop right away after closing dash, but that's tracked as #1045298. Approving.

review: Approve

=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2012-08-28 08:30:00 +0000
+++ dash/previews/Track.cpp	2012-08-31 14:44:00 +0000
@@ -194,19 +194,16 @@
   nux::BaseTexture* tex_play = style.GetPlayIcon();
   IconTexture* status_play = new IconTexture(tex_play, style.GetStatusIconSize(), style.GetStatusIconSize());
   status_play->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
-  status_play->SetInputEventSensitivity(false);  
 
   nux::BaseTexture* tex_pause = style.GetPauseIcon();
   IconTexture* status_pause = new IconTexture(tex_pause, style.GetStatusIconSize(), style.GetStatusIconSize());
   status_pause->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
-  status_pause->SetInputEventSensitivity(false);  
 
   track_number_ = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   track_number_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_CENTRE);
   track_number_->SetTextVerticalAlignment(nux::StaticCairoText::NUX_ALIGN_CENTRE);
   track_number_->SetLines(-1);
   track_number_->SetFont(style.track_font());
-  track_number_->SetInputEventSensitivity(false);  
 
   title_ = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   title_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
@@ -229,26 +226,18 @@
   status_play_layout_->GetLayout()->AddSpace(0, 1);
   status_play_layout_->GetLayout()->AddView(status_play, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   status_play_layout_->GetLayout()->AddSpace(0, 1);
-  status_play_layout_->mouse_click.connect([&](int, int, unsigned long, unsigned long) { play.emit(uri_); });
-  status_play_layout_->mouse_enter.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseEnter));
-  status_play_layout_->mouse_leave.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseLeave));
 
   status_pause_layout_ = new TmpView();
   status_pause_layout_->SetLayout(new nux::HLayout());
   status_pause_layout_->GetLayout()->AddSpace(0, 1);
   status_pause_layout_->GetLayout()->AddView(status_pause, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   status_pause_layout_->GetLayout()->AddSpace(0, 1);
-  status_pause_layout_->mouse_click.connect([&](int, int, unsigned long, unsigned long) { pause.emit(uri_); });
-  status_pause_layout_->mouse_enter.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseEnter));
-  status_pause_layout_->mouse_leave.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseLeave));
 
   track_number_layout_ = new TmpView();
   track_number_layout_->SetLayout(new nux::HLayout());
   track_number_layout_->GetLayout()->AddSpace(0, 1);
   track_number_layout_->GetLayout()->AddView(track_number_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   track_number_layout_->GetLayout()->AddSpace(0, 1);
-  track_number_layout_->mouse_enter.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseEnter));
-  track_number_layout_->mouse_leave.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseLeave));
 
   track_status_layout_ = new nux::LayeredLayout();
   track_status_layout_->AddLayer(status_play_layout_, true);
@@ -265,11 +254,27 @@
   duration_layout_->AddSpace(0, 1);
   duration_layout_->AddView(duration_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  layout->SetSpaceBetweenChildren(6);
   layout->AddLayout(track_status_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   layout->AddLayout(title_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   layout->AddLayout(duration_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   SetLayout(layout);
+
+  mouse_enter.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseEnter));
+  mouse_leave.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseLeave));
+  mouse_click.connect([&](int, int, unsigned long, unsigned long)
+  {
+    switch (play_state_)
+    {
+      case dash::PLAYING:
+        pause.emit(uri_);
+        break;
+      case dash::PAUSED:
+      case dash::STOPPED:
+      default:
+        play.emit(uri_);
+        break;
+    }
+  });
 }
 
 void Track::Draw(nux::GraphicsEngine& gfx_engine, bool force_draw)
@@ -342,9 +347,18 @@
   gfx_engine.PopClippingRectangle();
 }
 
+nux::Area* Track::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
+{
+    bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
+    if (mouse_inside == false)
+      return NULL;
+
+  return this;
+}
+
 bool Track::HasStatusFocus() const
 {
-  return play_state_ == dash::PLAYING || play_state_ == dash::PAUSED;
+  return mouse_over_ || play_state_ == dash::PLAYING || play_state_ == dash::PAUSED;
 }
 
 void Track::OnTrackControlMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags)

=== modified file 'dash/previews/Track.h'
--- dash/previews/Track.h	2012-08-22 10:03:52 +0000
+++ dash/previews/Track.h	2012-08-31 14:44:00 +0000
@@ -61,6 +61,7 @@
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void PreLayoutManagement();
+  virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
  
   // From debug::Introspectable
   std::string GetName() const;

=== modified file 'manual-tests/Preview.txt'
--- manual-tests/Preview.txt	2012-08-24 22:23:11 +0000
+++ manual-tests/Preview.txt	2012-08-31 14:44:00 +0000
@@ -73,7 +73,7 @@
   The Track information will contain a title and duration.
 
 
-Preview Music Play
+Preview Music Track Play
 note: Should be automated.
 ------------
 This tests the dash music preview track play
@@ -84,14 +84,16 @@
 #. Open a preview for a result which contains tracks.
 
 Actions:
-#. Play first track.
+#. Hover over track number for the track you wish to play.
+#. Click play icon.
 
 Expected Result:
+  When hovering on track number, it will change to a play icon.
   Music Player daemon will start playing track and update status of the track
   in the preview to playing as well as update it's progress.
 
 
-Preview Music Pause
+Preview Music Track Pause
 note: Should be automated.
 ------------
 This tests the dash preview preview navigate right animation
@@ -100,12 +102,14 @@
 #. Open music lens (Super+M)
 #. Enter arbitrary search string and ensure a result is available.
 #. Open a preview for a result which contains tracks.
-#. Play first track.
+#. Play first track. (by hovering+click on track number.)
 
 Actions:
-#. Pause playing track.
+#. Hover over pause icon for the track which is playing.
+#. Click pause icon.
 
 Expected Result:
+  When hovering on play icon, it will change to a pause icon.
   Music Player daemon will pause the playing track and update it's status
   to paused. Progress will stop incresing.