Merge lp:~townsend/unity/unity.lp1046315 into lp:unity

[Christopher Townsend]

Add support to close previews by either right, middle, or left clicking in the preview. (lp: #1046315)

This change is to add the capability to close a preview with just clicking a mouse button anywhere in the preview. Even though the bug says middle and right clicking, after discussing this with John Lea via email, it should be left, middle, or right clicking to close the preview.

Also, I reverterted a change I did in preview/Preview.h (PreviewInfoHintWidget::Ptr preview_info_hints_;) in order to avoid a nasty header circular dependency.

Added an AP test that iterates through various elements of the preview as well as iterates through left, middle, and right clicking.

[Łukasz Zemczak (sil2100)]

Looking nice. But I would also like this to have some automatic testing. Since some time we no longer accept manual test-cases as valid testing methods. This feature seems to be testable by using Autopilot - would be nice if such a test could be added. If you would need help, we can help.

review: Needs Fixing (test coverage)

[Christopher Townsend (townsend)]

Ok, thanks. I wasn't aware of the non-acceptance of manual tests. I will work on autmating the tests for this and will ping folks if I need help.

[Christopher Townsend (townsend)]

I've now added a new Autopilot test for this feature.

I also found a new bug with said new AP test and fixed that:)

[Brandon Schaefer (brandontschaefer)]

329 + preview_container_ = new PreviewContainer();

Can we switch to use the ::Ptr typedef in PreviewContainer.h? As right now that looks like that leaks memory ;). (As I don't see a delete). Could you also put that into the init list?

Alright, so your AP test works, but it needs to be split up. Each click needs to be in its own test. ie.

-- This stuff can be in the setup function
Open Dash
(AddCleanup to close the dash)
Type Software Update
Right Click to go into Preview

--- Then make new functions for
- right clicking the IconTexture
- right clicking the Static Cairo
- etc.

As each AP test needs to test one thing, and assert one thing (Ideally).

You have everything working, and it looks good now its just refactoring them into specific tests ;).

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

384 - sigc::signal<void> request_close;
385 + sigc::signal<void> GetPreviewRequestClose() const;

Mhmmh, I see why you're using a getter here, however this could be confusing, I'd rename the method to keep the same style we use for signals (and so just "request_close()" or "preview_request_close()")

329 + preview_container_ = new PreviewContainer();

Why do you need to use a pointer here? Stack allocation should be fine...
However, it's not that clear to me why you need to create some new containers just only for the signal handling...

[Christopher Townsend (townsend)]

> 329 + preview_container_ = new PreviewContainer();
>
> Can we switch to use the ::Ptr typedef in PreviewContainer.h? As right now
> that looks like that leaks memory ;). (As I don't see a delete). Could you
> also put that into the init list?
I thought I tried creating preview_container statically, but I seem to recall that it didn't work. However, I'll try it again as you're right, this is a memory leak:)

>
>
> Alright, so your AP test works, but it needs to be split up. Each click needs
> to be in its own test. ie.
>
> -- This stuff can be in the setup function
> Open Dash
> (AddCleanup to close the dash)
> Type Software Update
> Right Click to go into Preview
>
>
> --- Then make new functions for
> - right clicking the IconTexture
> - right clicking the Static Cairo
> - etc.
>
>
> As each AP test needs to test one thing, and assert one thing (Ideally).
>
> You have everything working, and it looks good now its just refactoring them
> into specific tests ;).
Oh, ok. Sure, I'll split this up into one test. I was trying to avoid a bunch of code duplication, but since the rule is one test, I'll make it so.

[Christopher Townsend (townsend)]

> 384 - sigc::signal<void> request_close;
> 385 + sigc::signal<void> GetPreviewRequestClose() const;
>
> Mhmmh, I see why you're using a getter here, however this could be confusing,
> I'd rename the method to keep the same style we use for signals (and so just
> "request_close()" or "preview_request_close()")
Ok, will do.

>
> 329 + preview_container_ = new PreviewContainer();
>
> Why do you need to use a pointer here? Stack allocation should be fine...
> However, it's not that clear to me why you need to create some new containers
> just only for the signal handling...
I did this because I wanted all of the various instantiated classes (ie, PreviewContainer, the various derived Preview classes, PreviewInfoHintWidget, and PreviewRatingsWidget) to only have to use one single OnMouseDown() method. As you know, mem_fun() requires it's first argument (the object pointer) to match where the second argument (the function) comes from. Doing what I did is the only way I could figure out how to make this work. I agree that it seems like overkill to have to instantiate a whole class to do this. If you know of a better way, then I'm all for it:)

[Christopher Townsend (townsend)]

After looking at the code again, I know remember why I had to do this:

400 + PreviewContainer* preview_container_;

329 + preview_container_ = new PreviewContainer();

It's to avoid a silly circular header dependency issue between Preview.h and PreviewContainer.h.

I will take Brandon's advise and try to make the pointer of type nux::ObjectPtr.

[Christopher Townsend (townsend)]

I also updated the AP tests to break out testing into separate tests. There are now 15 total tests that tests left, middle, and right clicking on a few various parts of the preview.

[Brandon Schaefer (brandontschaefer)]

Awesome, looks good to me :).

Test pass and manually testing works. Code changes look good.

review: Approve

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/ApplicationPreview.cpp	2013-01-16 18:36:23 +0000
@@ -37,6 +37,7 @@
  
 #include "ApplicationPreview.h"
 #include "ActionButton.h"
+#include "PreviewInfoHintWidget.h"
 #include "PreviewRatingsWidget.h"
 
 namespace unity
@@ -118,6 +119,8 @@
 
   previews::Style& 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); };
+
   nux::HLayout* image_data_layout = new nux::HLayout();
   image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
 
@@ -144,8 +147,10 @@
         nux::VLayout* icon_layout = new nux::VLayout();
         icon_layout->SetSpaceBetweenChildren(3);
         app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", 72);
+        AddChild(app_icon_.GetPointer());
         app_icon_->SetMinimumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
         app_icon_->SetMaximumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
+        app_icon_->mouse_click.connect(on_mouse_down);
         icon_layout->AddView(app_icon_.GetPointer(), 0);
 
         app_rating_ = new PreviewRatingsWidget();
@@ -154,6 +159,7 @@
         app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
         app_rating_->SetRating(app_preview_model->rating);
         app_rating_->SetReviews(app_preview_model->num_ratings);
+        app_rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         icon_layout->AddView(app_rating_.GetPointer(), 0);
 
         /////////////////////
@@ -168,15 +174,19 @@
         title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
         title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
+        AddChild(title_.GetPointer());
         title_->SetLines(-1);
         title_->SetFont(style.title_font().c_str());
+        title_->mouse_click.connect(on_mouse_down);
         title_subtitle_layout_->AddView(title_.GetPointer(), 1);
 
         if (!preview_model_->subtitle.Get().empty())
         {
           subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
+          AddChild(subtitle_.GetPointer());
           subtitle_->SetFont(style.subtitle_size_font().c_str());
           subtitle_->SetLines(-1);
+          subtitle_->mouse_click.connect(on_mouse_down);
           title_subtitle_layout_->AddView(subtitle_.GetPointer(), 1);
         }
 
@@ -186,8 +196,10 @@
         if (!app_preview_model->license.Get().empty())
         {
           license_ = new StaticCairoText(app_preview_model->license, true, NUX_TRACKER_LOCATION);
+          AddChild(license_.GetPointer());
           license_->SetFont(style.app_license_font().c_str());
           license_->SetLines(-1);
+          license_->mouse_click.connect(on_mouse_down);
           app_updated_copywrite_layout->AddView(license_.GetPointer(), 1);
         }
 
@@ -197,15 +209,19 @@
           last_update << _("Last Updated") << " " << app_preview_model->last_update.Get();
 
           last_update_ = new StaticCairoText(last_update.str(), true, NUX_TRACKER_LOCATION);
+          AddChild(last_update_.GetPointer());
           last_update_->SetFont(style.app_last_update_font().c_str());
+          last_update_->mouse_click.connect(on_mouse_down);
           app_updated_copywrite_layout->AddView(last_update_.GetPointer(), 1);
         }
 
         if (!app_preview_model->copyright.Get().empty())
         {
           copywrite_ = new StaticCairoText(app_preview_model->copyright, true, NUX_TRACKER_LOCATION);
+          AddChild(copywrite_.GetPointer());
           copywrite_->SetFont(style.app_copywrite_font().c_str());
           copywrite_->SetLines(-1);
+          copywrite_->mouse_click.connect(on_mouse_down);
           app_updated_copywrite_layout->AddView(copywrite_.GetPointer(), 1);
         }
 
@@ -223,6 +239,7 @@
       // Description
       nux::ScrollView* app_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
       app_info->EnableHorizontalScrollBar(false);
+      app_info->mouse_click.connect(on_mouse_down);
 
       nux::VLayout* app_info_layout = new nux::VLayout();
       app_info_layout->SetSpaceBetweenChildren(12);
@@ -231,10 +248,12 @@
       if (!preview_model_->description.Get().empty())
       {
         description_ = new StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
+        AddChild(description_.GetPointer());
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->mouse_click.connect(on_mouse_down);
         app_info_layout->AddView(description_.GetPointer());
       }
 
@@ -242,6 +261,7 @@
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
         AddChild(preview_info_hints_.GetPointer());
+        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         app_info_layout->AddView(preview_info_hints_.GetPointer());
       }
       /////////////////////
@@ -261,6 +281,7 @@
   image_data_layout->AddView(image_.GetPointer(), 0);
   image_data_layout->AddLayout(full_data_layout_, 1);
 
+  mouse_click.connect(on_mouse_down);
 
   SetLayout(image_data_layout);
 }

=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/GenericPreview.cpp	2013-01-16 18:36:23 +0000
@@ -32,6 +32,7 @@
 #include <Nux/AbstractButton.h>
 
 #include "GenericPreview.h"
+#include "PreviewInfoHintWidget.h"
 
 namespace unity
 {
@@ -110,6 +111,8 @@
   }
   previews::Style& 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); };
+
   nux::HLayout* image_data_layout = new nux::HLayout();
   image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
 
@@ -133,15 +136,19 @@
       preview_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
+      AddChild(title_.GetPointer());
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
+      title_->mouse_click.connect(on_mouse_down);
       preview_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
+        AddChild(subtitle_.GetPointer());
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
+        subtitle_->mouse_click.connect(on_mouse_down);
         preview_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
       /////////////////////
@@ -150,6 +157,7 @@
       // Description
       nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
       preview_info->EnableHorizontalScrollBar(false);
+      preview_info->mouse_click.connect(on_mouse_down);
 
       nux::VLayout* preview_info_layout = new nux::VLayout();
       preview_info_layout->SetSpaceBetweenChildren(12);
@@ -158,10 +166,12 @@
       if (!preview_model_->description.Get().empty())
       {
         description_ = new StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
+        AddChild(description_.GetPointer());
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->mouse_click.connect(on_mouse_down);
         preview_info_layout->AddView(description_.GetPointer());
       }
 
@@ -169,6 +179,7 @@
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
         AddChild(preview_info_hints_.GetPointer());
+        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         preview_info_layout->AddView(preview_info_hints_.GetPointer());
       }
       /////////////////////
@@ -189,6 +200,8 @@
 
   image_data_layout->AddLayout(full_data_layout_, 1);
 
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(image_data_layout);
 }
 

=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/MoviePreview.cpp	2013-01-16 18:36:23 +0000
@@ -32,6 +32,7 @@
 #include <Nux/AbstractButton.h>
 
 #include "MoviePreview.h"
+#include "PreviewInfoHintWidget.h"
 #include "PreviewRatingsWidget.h"
  
 namespace unity
@@ -120,6 +121,8 @@
   }
   previews::Style& 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); };
+
   nux::HLayout* image_data_layout = new nux::HLayout();
   image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
 
@@ -143,15 +146,19 @@
       app_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
+      AddChild(title_.GetPointer());
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
+      title_->mouse_click.connect(on_mouse_down);
       app_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
+        AddChild(subtitle_.GetPointer());
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
+        subtitle_->mouse_click.connect(on_mouse_down);
         app_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
       /////////////////////
@@ -162,11 +169,13 @@
       rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
       rating_->SetRating(movie_preview_model->rating);
       rating_->SetReviews(movie_preview_model->num_ratings);
+      rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
 
       /////////////////////
       // Description
       nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
       preview_info->EnableHorizontalScrollBar(false);
+      preview_info->mouse_click.connect(on_mouse_down);
 
       nux::VLayout* preview_info_layout = new nux::VLayout();
       preview_info_layout->SetSpaceBetweenChildren(12);
@@ -176,16 +185,19 @@
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
         AddChild(preview_info_hints_.GetPointer());
+        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         preview_info_layout->AddView(preview_info_hints_.GetPointer(), 0);
       }
 
       if (!preview_model_->description.Get().empty())
       {
         description_ = new StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
+        AddChild(description_.GetPointer());
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->mouse_click.connect(on_mouse_down);
         preview_info_layout->AddView(description_.GetPointer());
       }
       /////////////////////
@@ -206,6 +218,8 @@
   image_data_layout->AddView(image_.GetPointer(), 0);
   image_data_layout->AddLayout(full_data_layout_, 1);
 
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(image_data_layout);
 }
 

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/MusicPreview.cpp	2013-01-16 18:36:23 +0000
@@ -33,6 +33,7 @@
 #include "MusicPreview.h"
 #include "ActionButton.h"
 #include "Tracks.h"
+#include "PreviewInfoHintWidget.h"
 
 namespace unity
 {
@@ -101,6 +102,8 @@
   }
   previews::Style& 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); };
+
   nux::HLayout* image_data_layout = new nux::HLayout();
   image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
 
@@ -124,15 +127,19 @@
       album_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
+      AddChild(title_.GetPointer());
       title_->SetFont(style.title_font().c_str());
       title_->SetLines(-1);
+      title_->mouse_click.connect(on_mouse_down);
       album_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
+        AddChild(subtitle_.GetPointer());
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         subtitle_->SetLines(-1);
+        subtitle_->mouse_click.connect(on_mouse_down);
         album_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
 
@@ -147,6 +154,7 @@
         AddChild(tracks_.GetPointer());
         tracks_->play.connect(sigc::mem_fun(this, &MusicPreview::OnPlayTrack));
         tracks_->pause.connect(sigc::mem_fun(this, &MusicPreview::OnPauseTrack));
+        tracks_->mouse_click.connect(on_mouse_down);
       }
       /////////////////////
 
@@ -163,6 +171,7 @@
         hints_layout->AddSpace(0, 1);
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
         AddChild(preview_info_hints_.GetPointer());
+        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         hints_layout->AddView(preview_info_hints_.GetPointer(), 0);
 
         // If there are actions, we use a vertical layout
@@ -194,6 +203,8 @@
   image_data_layout->AddView(image_.GetPointer(), 0);
   image_data_layout->AddLayout(full_data_layout_, 1);
 
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(image_data_layout);
 }
 

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/Preview.cpp	2013-01-16 18:36:23 +0000
@@ -225,6 +225,7 @@
   , title_(nullptr)
   , subtitle_(nullptr)
 {
+  preview_container_ = new PreviewContainer;
 }
 
 Preview::~Preview()
@@ -320,6 +321,8 @@
   
   previews::Style& 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); };
+
   std::string image_hint;
   if (preview_model_->image.Get())
   {
@@ -334,13 +337,7 @@
     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();
-    }
-  });
+  cover_art->mouse_click.connect(on_mouse_down);
 }
 
 nux::Area* Preview::FindKeyFocusArea(unsigned int key_symbol,
@@ -368,6 +365,11 @@
     nux::GetWindowCompositor().SetKeyFocusArea(default_focus);
 }
 
+sigc::signal<void> Preview::request_close() const
+{
+  return preview_container_->request_close;
+}
+
 }
 }
 }

=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h	2012-12-21 19:22:51 +0000
+++ dash/previews/Preview.h	2013-01-16 18:36:23 +0000
@@ -29,7 +29,6 @@
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/StaticCairoText.h"
-#include "PreviewInfoHintWidget.h"
 
 namespace nux
 {
@@ -51,6 +50,7 @@
 class CoverArt;
 class TabIterator;
 class PreviewInfoHintWidget;
+class PreviewContainer;
 
 class Preview : public nux::View, public debug::Introspectable
 {
@@ -67,7 +67,7 @@
 
   static previews::Preview::Ptr PreviewForModel(dash::Preview::Ptr model);  
   
-  sigc::signal<void> request_close;
+  sigc::signal<void> request_close() const;
 
   virtual nux::Area* FindKeyFocusArea(unsigned int key_symbol,
                                       unsigned long x11_key_code,
@@ -104,11 +104,15 @@
   nux::ObjectPtr<StaticCairoText> title_;
   nux::ObjectPtr<StaticCairoText> subtitle_;
   nux::ObjectPtr<StaticCairoText> description_;
-  PreviewInfoHintWidget::Ptr preview_info_hints_;
+  nux::ObjectPtr<PreviewInfoHintWidget> preview_info_hints_;
 
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
 
   friend class PreviewContent;
+
+  // Need to declare this as a pointer to avoid a circular header
+  // dependency issue between Preview.h and PreviewContainer.h
+  nux::ObjectPtr<PreviewContainer> preview_container_;
 };
 
 }

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2012-12-13 14:26:56 +0000
+++ dash/previews/PreviewContainer.cpp	2013-01-16 18:36:23 +0000
@@ -420,7 +420,7 @@
   
   if (preview_view)
   {
-    preview_view->request_close.connect([this]() { request_close.emit(); });
+    preview_view->request_close().connect([this]() { request_close.emit(); });
   }
   
   preview_layout_->PushPreview(preview_view, direction);
@@ -681,7 +681,9 @@
 
 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)
+  int button = nux::GetEventButton(button_flags);
+
+  if (button == nux::MOUSE_BUTTON1 || button == nux::MOUSE_BUTTON2 || button == nux::MOUSE_BUTTON3)
   {
     request_close.emit();
   }
@@ -692,7 +694,6 @@
   return layout_content_->GetAbsoluteGeometry();  
 }
 
-
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2012-11-29 10:19:01 +0000
+++ dash/previews/PreviewContainer.h	2013-01-16 18:36:23 +0000
@@ -83,13 +83,14 @@
 
   nux::Geometry GetLayoutGeometry() const;
 
+  void OnMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
+
 protected:
   void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
 
   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();
@@ -116,7 +117,7 @@
   friend class PreviewContent;
 };
 
-} // napespace prviews
+} // namespace previews
 } // namespace dash
 } // namespace unity
 

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2012-12-14 12:14:34 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2013-01-16 18:36:23 +0000
@@ -145,6 +145,8 @@
 
   previews::Style& style = 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); };
+
   nux::VLayout* layout = new nux::VLayout();
   layout->SetSpaceBetweenChildren(6);
 
@@ -163,12 +165,14 @@
       info_name->SetFont(style.info_hint_bold_font());
       info_name->SetLines(-1);
       info_name->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+      info_name->mouse_click.connect(on_mouse_down);
       hint_layout->AddView(info_name.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
     }
 
     StaticCairoTextPtr info_value(new StaticCairoText(StringFromVariant(info_hint->value), true, NUX_TRACKER_LOCATION));
     info_value->SetFont(style.info_hint_font());
     info_value->SetLines(-1);
+    info_value->mouse_click.connect(on_mouse_down);
     hint_layout->AddView(info_value.GetPointer(), 1, nux::MINOR_POSITION_CENTER);
 
     InfoHint info_hint_views(info_name, info_value);
@@ -177,6 +181,8 @@
     layout->AddLayout(hint_layout, 0);
   }
 
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(layout);
 }
 
@@ -227,7 +233,6 @@
   View::PreLayoutManagement();
 }
 
-
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewInfoHintWidget.h'
--- dash/previews/PreviewInfoHintWidget.h	2012-12-14 12:14:34 +0000
+++ dash/previews/PreviewInfoHintWidget.h	2013-01-16 18:36:23 +0000
@@ -27,6 +27,7 @@
 #include <Nux/View.h>
 #include <UnityCore/Preview.h>
 #include "unity-shared/Introspectable.h"
+#include "PreviewContainer.h"
 
 namespace unity
 {
@@ -55,6 +56,8 @@
   
   void PreLayoutManagement();
 
+  sigc::signal<void> request_close() const { return preview_container_.request_close; }
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -78,9 +81,12 @@
   
   dash::Preview::Ptr preview_model_;
   typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
+
+private:
+  PreviewContainer preview_container_;
 };
 
-} // napespace prviews
+} // namespace previews
 } // namespace dash
 } // namespace unity
 

=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2012-12-14 12:14:34 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2013-01-16 18:36:23 +0000
@@ -49,14 +49,20 @@
 
   previews::Style& style = 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); };
+
   ratings_ = new RatingsButton(18,2);
   ratings_->SetEditable(false);
+  ratings_->mouse_click.connect(on_mouse_down);
   layout->AddView(ratings_);
   
   reviews_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   reviews_->SetFont(style.user_rating_font());
+  reviews_->mouse_click.connect(on_mouse_down);
   layout->AddView(reviews_);
 
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(layout);
 }
 
@@ -109,7 +115,6 @@
     .add(GetAbsoluteGeometry());
 }
 
-
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewRatingsWidget.h'
--- dash/previews/PreviewRatingsWidget.h	2012-12-14 12:14:34 +0000
+++ dash/previews/PreviewRatingsWidget.h	2013-01-16 18:36:23 +0000
@@ -25,6 +25,7 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
+#include "PreviewContainer.h"
 
 namespace nux
 {
@@ -51,6 +52,8 @@
 
   void SetReviews(int count);
 
+  sigc::signal<void> request_close() const { return preview_container_.request_close; }
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -64,6 +67,8 @@
 private:
   RatingsButton* ratings_;
   StaticCairoText* reviews_;
+
+  PreviewContainer preview_container_;
 };
 
 } // namespace previews

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2012-12-21 19:22:51 +0000
+++ dash/previews/SocialPreview.cpp	2013-01-16 18:36:23 +0000
@@ -39,6 +39,7 @@
 #include "SocialPreviewContent.h"
 #include "SocialPreviewComments.h"
 #include "ActionButton.h"
+#include "PreviewInfoHintWidget.h"
 
 namespace unity
 {
@@ -119,6 +120,8 @@
 
   previews::Style& 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); };
+
   nux::HLayout* image_data_layout = new nux::HLayout();
   image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
 
@@ -155,7 +158,9 @@
         nux::VLayout* icon_layout = new nux::VLayout();
         icon_layout->SetSpaceBetweenChildren(3);
         avatar_ = new IconTexture(social_preview_model->avatar.Get().RawPtr() ? g_icon_to_string(social_preview_model->avatar.Get().RawPtr()) : "", MIN(style.GetAvatarAreaWidth(), style.GetAvatarAreaHeight()));
+        AddChild(avatar_.GetPointer());
         avatar_->SetMinMaxSize(style.GetAvatarAreaWidth(), style.GetAvatarAreaHeight());
+        avatar_->mouse_click.connect(on_mouse_down);
         icon_layout->AddView(avatar_.GetPointer(), 0);
 
         /////////////////////
@@ -166,12 +171,16 @@
         social_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
         title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
+        AddChild(title_.GetPointer());
         title_->SetLines(-1);
         title_->SetFont(style.title_font().c_str());
+        title_->mouse_click.connect(on_mouse_down);
 
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
+        AddChild(subtitle_.GetPointer());
         subtitle_->SetFont(style.content_font().c_str());
         subtitle_->SetLines(-1);
+        subtitle_->mouse_click.connect(on_mouse_down);
 
         social_data_layout->AddView(title_.GetPointer(), 0);
         social_data_layout->AddView(subtitle_.GetPointer(), 0);
@@ -188,6 +197,7 @@
       // Details
       nux::ScrollView* social_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
       social_info->EnableHorizontalScrollBar(false);
+      social_info->mouse_click.connect(on_mouse_down);
 
       nux::VLayout* social_info_layout = new nux::VLayout();
       social_info_layout->SetSpaceBetweenChildren(12);
@@ -197,6 +207,7 @@
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetAvatarAreaWidth());
         AddChild(preview_info_hints_.GetPointer());
+        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         social_info_layout->AddView(preview_info_hints_.GetPointer(), 0);
       }
       /////////////////////
@@ -209,13 +220,16 @@
         tmp_comments_hint += ":";
 
         comments_hint_ = new StaticCairoText(tmp_comments_hint, true, NUX_TRACKER_LOCATION);
+        AddChild(comments_hint_.GetPointer());
         comments_hint_->SetLines(-1);
         comments_hint_->SetFont(style.info_hint_bold_font().c_str());
         comments_hint_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+        comments_hint_->mouse_click.connect(on_mouse_down);
         comments_layout->AddView(comments_hint_.GetPointer(), 0, nux::MINOR_POSITION_START);
 
         comments_ = new SocialPreviewComments(preview_model_, NUX_TRACKER_LOCATION);
         AddChild(comments_.GetPointer());
+        comments_->request_close().connect([this]() { preview_container_->request_close.emit(); });
         comments_layout->AddView(comments_.GetPointer());
         social_info_layout->AddView(comments_layout, 0);
       }
@@ -237,6 +251,7 @@
   image_data_layout->AddView(social_content_layout, 0);
   image_data_layout->AddLayout(full_data_layout_, 1);
 
+  mouse_click.connect(on_mouse_down);
 
   SetLayout(image_data_layout);
 }

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2012-12-14 12:14:34 +0000
+++ dash/previews/SocialPreviewComments.cpp	2013-01-16 18:36:23 +0000
@@ -128,6 +128,8 @@
 
   previews::Style& style = 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); };
+
   nux::VLayout* layout = new nux::VLayout();
   layout->SetSpaceBetweenChildren(6);
 
@@ -144,6 +146,7 @@
       comment_name->SetFont(style.info_hint_bold_font());
       comment_name->SetLines(-1);
       comment_name->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+      comment_name->mouse_click.connect(on_mouse_down);
       name_layout->AddView(comment_name.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
 
@@ -154,6 +157,7 @@
       comment_time->SetFont(style.info_hint_font());
       comment_time->SetLines(-1);
       comment_time->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+      comment_time->mouse_click.connect(on_mouse_down);
       name_layout->AddView(comment_time.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
 
@@ -166,6 +170,7 @@
     comment_value->SetFont(style.info_hint_font());
     comment_value->SetLines(-7);
     comment_value->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+    comment_value->mouse_click.connect(on_mouse_down);
     comment_layout->AddView(comment_value.GetPointer(), 1, nux::MINOR_POSITION_START);
 
     Comment comment_views(comment_name, comment_value);
@@ -174,6 +179,8 @@
     layout->AddLayout(name_layout, 0);
     layout->AddLayout(comment_layout, 1);
   }
+  mouse_click.connect(on_mouse_down);
+
   SetLayout(layout);
 
 }

=== modified file 'dash/previews/SocialPreviewComments.h'
--- dash/previews/SocialPreviewComments.h	2012-12-14 12:14:34 +0000
+++ dash/previews/SocialPreviewComments.h	2013-01-16 18:36:23 +0000
@@ -29,6 +29,7 @@
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/Introspectable.h"
 #include <UnityCore/SocialPreview.h>
+#include "PreviewContainer.h"
 
 namespace unity
 {
@@ -47,6 +48,8 @@
 
   virtual ~SocialPreviewComments();
 
+  sigc::signal<void> request_close() const { return preview_container_.request_close; }
+
 protected:
 
   typedef nux::ObjectPtr<StaticCairoText> StaticCairoTextPtr;
@@ -69,6 +72,8 @@
 private:
 
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+
+  PreviewContainer preview_container_;
 };
 
 }

=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2012-12-03 03:51:16 +0000
+++ tests/autopilot/unity/emulators/dash.py	2013-01-16 18:36:23 +0000
@@ -411,7 +411,24 @@
 
     @property
     def cover_art(self):
-        return self.get_children_by_type(CoverArt)[0]
+        return self.get_children_by_type(CoverArt)
+
+    @property
+    def ratings_widget(self):
+        return self.get_children_by_type(PreviewRatingsWidget)
+
+    @property
+    def info_hint_widget(self):
+        return self.get_children_by_type(PreviewInfoHintWidget)
+
+    @property
+    def icon(self):
+        return self.get_children_by_type(IconTexture)
+
+    @property
+    def text_boxes(self):
+        return self.get_children_by_type(StaticCairoText)
+
 
 class ApplicationPreview(Preview):
     """A application preview of a dash lens result."""
@@ -555,6 +572,10 @@
         return self.get_children_by_type(IconTexture);
 
 
+class PreviewInfoHintWidget(UnityIntrospectionObject):
+    """A view containing additional info for a preview."""
+
+
 class PreviewRatingsWidget(UnityIntrospectionObject):
     """A view containing a rating button and user rating count."""
 
@@ -570,3 +591,10 @@
 class ActionButton(UnityIntrospectionObject):
     """A preview action button."""
 
+
+class IconTexture(UnityIntrospectionObject):
+    """An icon for the preview."""
+
+
+class StaticCairoText(UnityIntrospectionObject):
+    """Text boxes in the preview"""

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-01-15 21:53:55 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-01-16 18:36:23 +0000
@@ -930,7 +930,7 @@
 
     def test_preview_refocus_close(self):
         """Clicking on a preview element must not lose keyboard focus."""
-        cover_art = self.preview_container.current_preview.cover_art
+        cover_art = self.preview_container.current_preview.cover_art[0]
 
         # click the cover-art (this will set focus)
         tx = cover_art.x + (cover_art.width / 2)
@@ -942,23 +942,185 @@
 
         self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
 
+
+class PreviewClickCancelTests(DashTestCase):
+    """Tests that the preview closes when left, middle, and right clicking in the preview"""
+
+    def setUp(self):
+        super(PreviewClickCancelTests, self).setUp()
+        lens = self.dash.reveal_application_lens()
+        self.addCleanup(self.dash.ensure_hidden)
+        # Only testing an application preview for this test.
+        self.keyboard.type("Software Updater")
+        results_category = lens.get_category_by_name(_("Installed"))
+        results = results_category.get_results()
+
+        result = results[0]
+        result.preview()
+        self.assertThat(self.dash.view.preview_displaying, Eventually(Equals(True)))
+
+        self.preview_container = self.dash.view.get_preview_container()
+
+    def test_left_click_on_preview_icon_cancel_preview(self):
+        """Left click on preview icon must close preview."""
+        icon = self.preview_container.current_preview.icon[0]
+
+        tx = icon.x + icon.width
+        ty = icon.y + (icon.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=1)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_middle_click_on_preview_icon_cancel_preview(self):
+        """Middle click on preview icon must close preview."""
+        icon = self.preview_container.current_preview.icon[0]
+
+        tx = icon.x + icon.width
+        ty = icon.y + (icon.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=2)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_right_click_on_preview_icon_cancel_preview(self):
+        """Right click on preview icon must close preview."""
+        icon = self.preview_container.current_preview.icon[0]
+
+        tx = icon.x + icon.width
+        ty = icon.y + (icon.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=3)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
     def test_left_click_on_preview_image_cancel_preview(self):
         """Left click on preview image must cancel the preview."""
-        cover_art = self.preview_container.current_preview.cover_art
+        cover_art = self.preview_container.current_preview.cover_art[0]
 
         tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 4)
+        ty = cover_art.y + (cover_art.height / 2)
         self.mouse.move(tx, ty)
         self.mouse.click(button=1)
 
         self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
 
+    def test_middle_click_on_preview_image_cancel_preview(self):
+        """Middle click on preview image must cancel the preview."""
+        cover_art = self.preview_container.current_preview.cover_art[0]
+
+        tx = cover_art.x + (cover_art.width / 2)
+        ty = cover_art.y + (cover_art.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=2)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
     def test_right_click_on_preview_image_cancel_preview(self):
-        """Right click on preview image must cancel preview."""
-        cover_art = self.preview_container.current_preview.cover_art
+        """Right click on preview image must cancel the preview."""
+        cover_art = self.preview_container.current_preview.cover_art[0]
 
         tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 4)
+        ty = cover_art.y + (cover_art.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=3)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_left_click_on_preview_text_cancel_preview(self):
+        """Left click on some preview text must cancel the preview."""
+        text = self.preview_container.current_preview.text_boxes[0]
+
+        tx = text.x + (text.width / 2)
+        ty = text.y + (text.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=1)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_middle_click_on_preview_text_cancel_preview(self):
+        """Middle click on some preview text must cancel the preview."""
+        text = self.preview_container.current_preview.text_boxes[0]
+
+        tx = text.x + (text.width / 2)
+        ty = text.y + (text.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=2)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_right_click_on_preview_text_cancel_preview(self):
+        """Right click on some preview text must cancel the preview."""
+        text = self.preview_container.current_preview.text_boxes[0]
+
+        tx = text.x + (text.width / 2)
+        ty = text.y + (text.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=3)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_left_click_on_preview_ratings_widget_cancel_preview(self):
+        """Left click on the ratings widget must cancel the preview."""
+        ratings_widget = self.preview_container.current_preview.ratings_widget[0]
+
+        tx = ratings_widget.x + (ratings_widget.width / 2)
+        ty = ratings_widget.y + (ratings_widget.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=1)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_middle_click_on_preview_ratings_widget_cancel_preview(self):
+        """Middle click on the ratings widget must cancel the preview."""
+        ratings_widget = self.preview_container.current_preview.ratings_widget[0]
+
+        tx = ratings_widget.x + (ratings_widget.width / 2)
+        ty = ratings_widget.y + (ratings_widget.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=2)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_right_click_on_preview_ratings_widget_cancel_preview(self):
+        """Right click on the ratings widget must cancel the preview."""
+        ratings_widget = self.preview_container.current_preview.ratings_widget[0]
+
+        tx = ratings_widget.x + (ratings_widget.width / 2)
+        ty = ratings_widget.y + (ratings_widget.height / 2)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=3)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_left_click_on_preview_info_hint_cancel_preview(self):
+        """Left click on the info hint must cancel the preview."""
+        info_hint = self.preview_container.current_preview.info_hint_widget[0]
+
+        tx = info_hint.x + (info_hint.width / 2)
+        ty = info_hint.y + (info_hint.height / 8)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=1)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_middle_click_on_preview_info_hint_cancel_preview(self):
+        """Middle click on the info hint must cancel the preview."""
+        info_hint = self.preview_container.current_preview.info_hint_widget[0]
+
+        tx = info_hint.x + (info_hint.width / 2)
+        ty = info_hint.y + (info_hint.height / 8)
+        self.mouse.move(tx, ty)
+        self.mouse.click(button=2)
+
+        self.assertThat(self.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_right_click_on_preview_info_hint_cancel_preview(self):
+        """Right click on the info hint must cancel the preview."""
+        info_hint = self.preview_container.current_preview.info_hint_widget[0]
+
+        tx = info_hint.x + (info_hint.width / 2)
+        ty = info_hint.y + (info_hint.height / 8)
         self.mouse.move(tx, ty)
         self.mouse.click(button=3)
 

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2013-01-11 11:22:19 +0000
+++ unity-shared/StaticCairoText.cpp	2013-01-16 18:36:23 +0000
@@ -34,6 +34,7 @@
 #include <pango/pangocairo.h>
 
 #include <UnityCore/GLibWrapper.h>
+#include <UnityCore/Variant.h>
 
 #include "CairoTexture.h"
 
@@ -492,6 +493,17 @@
   return list;
 }
 
+std::string StaticCairoText::GetName() const
+{
+  return "StaticCairoText";
+}
+
+void StaticCairoText::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper(builder)
+  .add(GetGeometry());
+}
+
 std::string StaticCairoText::Impl::GetEffectiveFont() const
 {
   if (font_.empty())

=== modified file 'unity-shared/StaticCairoText.h'
--- unity-shared/StaticCairoText.h	2012-12-14 12:14:34 +0000
+++ unity-shared/StaticCairoText.h	2013-01-16 18:36:23 +0000
@@ -26,11 +26,13 @@
 #include <Nux/Nux.h>
 #include <Nux/View.h>
 
+#include "unity-shared/Introspectable.h"
+
 namespace unity
 {
 class Validator;
 
-class StaticCairoText : public nux::View
+class StaticCairoText : public nux::View, public unity::debug::Introspectable
 {
   NUX_DECLARE_OBJECT_TYPE (StaticCairoText, nux::View);
 public:
@@ -113,6 +115,10 @@
   std::vector<unsigned> GetTextureStartIndices();
   std::vector<unsigned> GetTextureEndIndices();
 
+  // From debug::Introspectable
+  std::string GetName() const;
+  void AddProperties(GVariantBuilder* builder);
+
 private:
   struct Impl;
   Impl* pimpl;