Merge lp:~townsend/unity/fix-close-social-preview into lp:unity

[Christopher Townsend]

Add support to close social previews by clicking anywhere in the preview bubble.

Closing the social preview by clicking in the preview bubble doesn't work. This was missed when the "click anywhere in a preview" work was originally done for 13.04.

The fixes it by adding the necessary plumbing to the SocialPreviewContent class.

[Brandon Schaefer (brandontschaefer)]

Awesome, confirmed fixed! :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3368
http://jenkins.qa.ubuntu.com/job/unity-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/129/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2013-01-16 15:43:38 +0000
+++ dash/previews/SocialPreview.cpp	2013-06-11 21:35:32 +0000
@@ -132,6 +132,7 @@
   if (social_preview_model->description.Get().length() > 0)
   {
     content_ = new SocialPreviewContent(social_preview_model->description, NUX_TRACKER_LOCATION);
+    content_->request_close().connect([this]() { preview_container_->request_close.emit(); });
     social_content_layout->AddView(content_.GetPointer(), 1);
   } else {
     image_ = new CoverArt();

=== modified file 'dash/previews/SocialPreviewContent.cpp'
--- dash/previews/SocialPreviewContent.cpp	2013-02-17 17:03:52 +0000
+++ dash/previews/SocialPreviewContent.cpp	2013-06-11 21:35:32 +0000
@@ -130,14 +130,20 @@
 {
   dash::previews::Style const& style = dash::previews::Style::Instance();
 
+  auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
+
   text_ = new StaticCairoText("", false, NUX_TRACKER_LOCATION);
   text_->SetLines(-8);
   text_->SetFont(style.content_font());
   text_->SetLineSpacing(5);
   text_->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_MIDDLE);
+  text_->mouse_click.connect(on_mouse_down);
 
   nux::Layout* layout = new nux::Layout();
   layout->AddView(text_.GetPointer(), 1);
+
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(layout);
 
   cr_bubble_.reset(new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &SocialPreviewContent::RedrawBubble), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));

=== modified file 'dash/previews/SocialPreviewContent.h'
--- dash/previews/SocialPreviewContent.h	2012-12-14 12:14:34 +0000
+++ dash/previews/SocialPreviewContent.h	2013-06-11 21:35:32 +0000
@@ -30,6 +30,7 @@
 #include <NuxCore/ObjectPtr.h>
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/Introspectable.h"
+#include "PreviewContainer.h"
 
 namespace unity
 {
@@ -49,6 +50,8 @@
 
   void SetText(std::string const& text);
 
+  sigc::signal<void> request_close() const { return preview_container_.request_close; }
+
 protected:
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
@@ -77,6 +80,8 @@
 
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
   NuxCairoPtr cr_bubble_;
+
+  PreviewContainer preview_container_;
 };
 
 }