Merge lp:~nicolas-doffay/unity/preview-click-exit into lp:unity

[Nicolas d'Offay]

Added left click exit functionality to preview image.

[Omer Akram (om26er)]

Writing an AP test for this will be simple I guess. I think I will be able to do that easily.

[Nick Dedekind (nick-dedekind)]

Looks like you've only added the functionality to the MusicPreview.
If you want to put it in all previews, put the mouse_click handling in Preview::UpdateCoverArtImage.

It also looks like this is also part of the fix for https://bugs.launchpad.net/unity-lens-applications/+bug/1045230. I've linked it.

review: Needs Fixing

=== modified file 'dash/CoverflowResultView.cpp'
--- dash/CoverflowResultView.cpp	2012-09-13 10:56:42 +0000
+++ dash/CoverflowResultView.cpp	2012-09-17 11:07:23 +0000
@@ -124,10 +124,12 @@
 
 void CoverflowResultItem::Activate(int button)
 {
-  if (button == 1)
+  //Left and right click take you to previews.
+  if (button == 1 || button == 3)
+    parent_->UriActivated.emit(result_.uri, ResultView::ActivateType::PREVIEW);
+  //Scroll click opens up music player.
+  else if (button == 2)
     parent_->UriActivated.emit(result_.uri, ResultView::ActivateType::DIRECT);
-  else if (button == 3)
-    parent_->UriActivated.emit(result_.uri, ResultView::ActivateType::PREVIEW);
 
   int index = Index();
   int size = model_->Items().size();

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2012-09-10 10:54:02 +0000
+++ dash/previews/MusicPreview.cpp	2012-09-17 11:07:23 +0000
@@ -145,6 +145,7 @@
   /////////////////////
   // Image
   image_ = new CoverArt();
+  
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
   /////////////////////

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2012-09-13 16:11:54 +0000
+++ dash/previews/Preview.cpp	2012-09-17 11:07:23 +0000
@@ -204,6 +204,14 @@
   else
     cover_art->SetNoImageAvailable();
   cover_art->SetFont(style.no_preview_image_font());
+  
+  cover_art->mouse_click.connect([this] (int x, int y, unsigned long button_flags, unsigned long key_flags) 
+  {
+    if (nux::GetEventButton(button_flags) == nux::MOUSE_BUTTON1 || nux::GetEventButton(button_flags) == nux::MOUSE_BUTTON3)
+    {
+      request_close.emit();
+    }
+  });
 }
 
 }

=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h	2012-08-22 10:03:52 +0000
+++ dash/previews/Preview.h	2012-09-17 11:07:23 +0000
@@ -59,6 +59,8 @@
   void AddProperties(GVariantBuilder* builder);
 
   static previews::Preview::Ptr PreviewForModel(dash::Preview::Ptr model);  
+  
+  sigc::signal<void> request_close;
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {}

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2012-09-17 10:00:38 +0000
+++ dash/previews/PreviewContainer.cpp	2012-09-17 11:07:23 +0000
@@ -381,6 +381,7 @@
   last_progress_time_.tv_nsec = 0;
 
   key_down.connect(sigc::mem_fun(this, &PreviewContainer::OnKeyDown));
+  mouse_click.connect(sigc::mem_fun(this, &PreviewContainer::OnMouseDown));
 }
 
 PreviewContainer::~PreviewContainer()
@@ -390,6 +391,12 @@
 void PreviewContainer::Preview(dash::Preview::Ptr preview_model, Navigation direction)
 {
   previews::Preview::Ptr preview_view = previews::Preview::PreviewForModel(preview_model);
+  
+  if (preview_view)
+  {
+    preview_view->request_close.connect([this]() { request_close.emit(); });
+  }
+  
   content_layout_->PushPreview(preview_view, direction);
 }
 
@@ -647,6 +654,14 @@
   }
 }
 
+void PreviewContainer::OnMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
+{
+  if (nux::GetEventButton(button_flags) == nux::MOUSE_BUTTON1 || nux::GetEventButton(button_flags) == nux::MOUSE_BUTTON3)
+  {
+    request_close.emit();
+  }
+}
+
 nux::Area* PreviewContainer::KeyNavIteration(nux::KeyNavDirection direction)
 {
   return this;

=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2012-09-04 10:45:31 +0000
+++ dash/previews/PreviewContainer.h	2012-09-17 11:07:23 +0000
@@ -84,7 +84,8 @@
 
   bool InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character);
   void OnKeyDown(unsigned long event_type, unsigned long event_keysym, unsigned long event_state, const TCHAR* character, unsigned short key_repeat_count);
-
+  void OnMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
+  
 private:
   void SetupViews();