Merge lp:~smspillaz/unity/switcher_view_interface into lp:unity

[Sam Spilsbury]

Pull an NVI out of SwitcherView so we can use it in testing purpose later.

Pull an NVI out of SwitcherView so we can use it in testing purpose later.

I know that the jury is still out on NVIs. I really don't care. I was asked to do it like this, and both virtual interfaces and nonvirtual interfaces have their merits.

Added convenience methods to replace direct access to properties within the NVI where it made sense.

[Sam Spilsbury (smspillaz)]

Bah.

Nux's insistence on its own pointer types actually makes this branch not-workable. WIP for now.

[Sam Spilsbury (smspillaz)]

At the moment we're just using the nux view by composition then.

[Brandon Schaefer (brandontschaefer)]

Text conflict in launcher/SwitcherController.cpp
Text conflict in launcher/SwitcherController.h
Text conflict in launcher/SwitcherView.cpp
Text conflict in launcher/SwitcherView.h
Text conflict in plugins/unityshell/src/GesturalWindowSwitcher.cpp
Text conflict in plugins/unityshell/src/unityshell.cpp
Contents conflict in tests/StubSwitcherController.h
Text conflict in tests/test-gestures/sed_script_switcher
8 conflicts encountered.

:(

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Not working on this as we're not putting any more substantial effort into UnityNux

review: Disapprove

[Sam Spilsbury (smspillaz)]

(Someone please reject this)

Unmerged revisions

3006. By Sam Spilsbury on 2012-12-20

Use the nux view by composition

3005. By Sam Spilsbury on 2012-12-19

The object returned to use in the a11y handler is the nux one, use that

3004. By Sam Spilsbury on 2012-12-19

Pull a non-virtual interface out of SwitcherView

=== modified file 'launcher/StandaloneSwitcher.cpp'
--- launcher/StandaloneSwitcher.cpp	2012-12-20 16:52:21 +0000
+++ launcher/StandaloneSwitcher.cpp	2012-12-20 16:52:21 +0000
@@ -74,37 +74,37 @@
 
 void OnBorderSizeChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->border_size = self->GetValue ();
+  controller->GetView ()->SetBorderSize(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
 void OnFlatSpacingSizeChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->flat_spacing = self->GetValue ();
+  controller->GetView ()->SetFlatSpacing(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
 void OnTextSizeChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->text_size = self->GetValue ();
+  controller->GetView ()->SetTextSize(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
 void OnIconSizeChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->icon_size = self->GetValue ();
+  controller->GetView ()->SetIconSize(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
 void OnTileSizeChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->tile_size = self->GetValue ();
+  controller->GetView ()->SetTileSize(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
 void OnAnimationLengthChanged (nux::RangeValueInteger *self)
 {
-  controller->GetView ()->animation_length = self->GetValue ();
+  controller->GetView ()->SetAnimationLength(self->GetValue ());
   controller->GetView ()->QueueDraw ();
 }
 
@@ -153,7 +153,7 @@
 
   controller->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, icons);
 
-  controller->GetView ()->render_boxes = true;
+  controller->GetView ()->SetRenderBoxes(true);
 
   nux::CheckBox* flipping_check = new nux::CheckBox(TEXT("Enable Automatic Flipping"), false, NUX_TRACKER_LOCATION);
   flipping_check->SetMaximumWidth(250);
@@ -185,7 +185,7 @@
   nux::StaticText* border_label = new nux::StaticText(TEXT("Border Size:"), NUX_TRACKER_LOCATION);
   border_layout->AddView(border_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * border_size_range = new nux::RangeValueInteger (controller->GetView ()->border_size, 0, 200, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * border_size_range = new nux::RangeValueInteger (controller->GetView ()->GetBorderSize(), 0, 200, NUX_TRACKER_LOCATION);
   border_size_range->sigValueChanged.connect (sigc::ptr_fun (OnBorderSizeChanged));
   border_layout->AddView(border_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
@@ -201,7 +201,7 @@
   nux::StaticText* flat_spacing_label = new nux::StaticText(TEXT("Flat Spacing:"), NUX_TRACKER_LOCATION);
   flat_spacing_layout->AddView(flat_spacing_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * flat_spacing_size_range = new nux::RangeValueInteger (controller->GetView ()->flat_spacing, 0, 200, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * flat_spacing_size_range = new nux::RangeValueInteger (controller->GetView ()->GetFlatSpacing(), 0, 200, NUX_TRACKER_LOCATION);
   flat_spacing_size_range->sigValueChanged.connect (sigc::ptr_fun (OnFlatSpacingSizeChanged));
   flat_spacing_layout->AddView(flat_spacing_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
@@ -216,7 +216,7 @@
   nux::StaticText* text_size_label = new nux::StaticText(TEXT("Text Size:"), NUX_TRACKER_LOCATION);
   text_size_layout->AddView(text_size_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * text_size_size_range = new nux::RangeValueInteger (controller->GetView ()->text_size, 0, 200, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * text_size_size_range = new nux::RangeValueInteger (controller->GetView ()->GetTextSize(), 0, 200, NUX_TRACKER_LOCATION);
   text_size_size_range->sigValueChanged.connect (sigc::ptr_fun (OnTextSizeChanged));
   text_size_layout->AddView(text_size_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
@@ -231,7 +231,7 @@
   nux::StaticText* icon_size_label = new nux::StaticText(TEXT("Icon Size:"), NUX_TRACKER_LOCATION);
   icon_size_layout->AddView(icon_size_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * icon_size_size_range = new nux::RangeValueInteger (controller->GetView ()->icon_size, 0, 200, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * icon_size_size_range = new nux::RangeValueInteger (controller->GetView ()->GetIconSize(), 0, 200, NUX_TRACKER_LOCATION);
   icon_size_size_range->sigValueChanged.connect (sigc::ptr_fun (OnIconSizeChanged));
   icon_size_layout->AddView(icon_size_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
@@ -246,7 +246,7 @@
   nux::StaticText* tile_size_label = new nux::StaticText(TEXT("Tile Size:"), NUX_TRACKER_LOCATION);
   tile_size_layout->AddView(tile_size_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * tile_size_size_range = new nux::RangeValueInteger (controller->GetView ()->tile_size, 0, 200, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * tile_size_size_range = new nux::RangeValueInteger (controller->GetView ()->GetTileSize(), 0, 200, NUX_TRACKER_LOCATION);
   tile_size_size_range->sigValueChanged.connect (sigc::ptr_fun (OnTileSizeChanged));
   tile_size_layout->AddView(tile_size_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
@@ -261,7 +261,7 @@
   nux::StaticText* animation_length_label = new nux::StaticText(TEXT("Animation Length:"), NUX_TRACKER_LOCATION);
   animation_length_layout->AddView(animation_length_label, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-  nux::RangeValueInteger * animation_length_size_range = new nux::RangeValueInteger (controller->GetView ()->animation_length, 0, 2000, NUX_TRACKER_LOCATION);
+  nux::RangeValueInteger * animation_length_size_range = new nux::RangeValueInteger (controller->GetView ()->GetAnimationLength(), 0, 2000, NUX_TRACKER_LOCATION);
   animation_length_size_range->sigValueChanged.connect (sigc::ptr_fun (OnAnimationLengthChanged));
   animation_length_layout->AddView(animation_length_size_range, 1, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FIX);
 
 
=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-12-20 16:52:21 +0000
+++ launcher/SwitcherController.cpp	2012-12-20 16:52:21 +0000
@@ -91,7 +91,7 @@
   impl_->Prev();
 }
 
-SwitcherView* Controller::GetView()
+View* Controller::GetView()
 {
   return impl_->GetView();
 }
@@ -175,7 +175,7 @@
   bg_color_ = nux::Color(red, green, blue, alpha);
 
   if (view_)
-    view_->background_color = bg_color_;
+    view_->SetBackgroundColor(bg_color_);
 }
 
 bool ShellController::CanShowSwitcher(const std::vector<AbstractLauncherIcon::Ptr>& results) const
@@ -311,16 +311,21 @@
 
   sources_.Remove(VIEW_CONSTRUCT_IDLE);
 
-  view_ = SwitcherView::Ptr(new SwitcherView());
-  AddChild(view_.GetPointer());
+  view_.reset (new switcher::View ([this]{
+    nux::ObjectPtr<switcher::NuxView> p(new switcher::NuxView());
+    introspectable_view_ = p.GetPointer();
+    nux_view_ = p.GetPointer();
+    return std::unique_ptr<switcher::View::Impl>(new switcher::NuxViewWrapper(p));
+  }));
+  AddChild(introspectable_view_);
   view_->SetModel(model_);
-  view_->background_color = bg_color_;
-  view_->monitor = monitor_;
+  view_->SetBackgroundColor(bg_color_);
+  view_->SetMonitor(monitor_);
   view_->SetupBackground();
 
   ConstructWindow();
-  main_layout_->AddView(view_.GetPointer(), 1);
-  view_window_->SetEnterFocusInputArea(view_.GetPointer());
+  main_layout_->AddView(nux_view_, 1);
+  view_window_->SetEnterFocusInputArea(nux_view_);
   view_window_->SetGeometry(workarea_);
   view_window_->SetOpacity(0.0f);
 
@@ -333,7 +338,7 @@
   workarea_ = geo;
 
   if (view_)
-    view_->monitor = monitor_;
+    view_->SetMonitor(monitor_);
 }
 
 void ShellController::Hide(bool accept_state)
@@ -375,7 +380,15 @@
   visible_ = false;
 
   if (view_)
-    main_layout_->RemoveChildObject(view_.GetPointer());
+    main_layout_->RemoveChildObject(nux_view_);
+
+  ubus_manager_.SendMessage(UBUS_SWITCHER_SHOWN, g_variant_new("(bi)", false, monitor_));
+
+  last_active_selection_ = nullptr;
+
+  view_.reset();
+  nux_view_ = nullptr;
+  introspectable_view_ = nullptr;
 
   if (view_window_)
   {
@@ -384,12 +397,6 @@
     view_window_->PushToBack();
     view_window_->EnableInputWindow(false);
   }
-
-  ubus_manager_.SendMessage(UBUS_SWITCHER_SHOWN, g_variant_new("(bi)", false, monitor_));
-
-  last_active_selection_ = nullptr;
-
-  view_.Release();
 }
 
 bool ShellController::Visible()
@@ -455,9 +462,9 @@
   }
 }
 
-SwitcherView* ShellController::GetView()
+View *ShellController::GetView()
 {
-  return view_.GetPointer();
+  return view_.get();
 }
 
 void ShellController::SetDetail(bool value, unsigned int min_windows)
 
=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-12-20 16:52:21 +0000
+++ launcher/SwitcherController.h	2012-12-20 16:52:21 +0000
@@ -94,7 +94,7 @@
     void SetWorkspace(nux::Geometry geo,
                       int monitor);
 
-    SwitcherView * GetView ();
+    View * GetView ();
 
     ui::LayoutWindow::Vector ExternalRenderTargets ();
 
@@ -142,7 +142,7 @@
     virtual void SetWorkspace(nux::Geometry geo,
                               int monitor) = 0;
 
-    virtual SwitcherView * GetView () = 0;
+    virtual View * GetView () = 0;
 
     virtual ui::LayoutWindow::Vector ExternalRenderTargets () = 0;
 
@@ -190,7 +190,7 @@
 
   void SetWorkspace(nux::Geometry geo, int monitor);
 
-  virtual SwitcherView* GetView();
+  virtual View* GetView();
 
   ui::LayoutWindow::Vector ExternalRenderTargets ();
 
@@ -226,7 +226,9 @@
   static bool CompareSwitcherItemsPriority(launcher::AbstractLauncherIcon::Ptr const& first, launcher::AbstractLauncherIcon::Ptr const& second);
 
   SwitcherModel::Ptr model_;
-  SwitcherView::Ptr view_;
+  debug::Introspectable *introspectable_view_;
+  NuxView               *nux_view_;
+  View::Ptr             view_;
 
   nux::Geometry workarea_;
   nux::ObjectPtr<nux::BaseWindow> view_window_;
 
=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2012-12-14 12:14:34 +0000
+++ launcher/SwitcherView.cpp	2012-12-20 16:52:21 +0000
@@ -32,10 +32,282 @@
 namespace switcher
 {
 
-NUX_IMPLEMENT_OBJECT_TYPE(SwitcherView);
-
-SwitcherView::SwitcherView()
-  : render_boxes(false)
+View::View(const ViewFactoryFunc &create)
+  : impl_(create())
+{
+}
+
+
+ui::LayoutWindow::Vector View::ExternalTargets()
+{
+  return impl_->ExternalTargets();
+}
+
+void View::SetModel(SwitcherModel::Ptr model)
+{
+  impl_->SetModel(model);
+}
+
+SwitcherModel::Ptr View::GetModel()
+{
+  return impl_->GetModel();
+}
+
+View::MouseEventConnections
+View::ConnectToMouseEvents(const View::MouseButtonCallback &mouse_down_callback,
+                           const View::MouseButtonCallback &mouse_up_callback,
+                           const View::MouseDragCallback   &mouse_drag_callback)
+{
+  return impl_->ConnectToMouseEvents(mouse_down_callback,
+                                     mouse_up_callback,
+                                     mouse_drag_callback);
+}
+
+void View::QueueDraw()
+{
+  impl_->QueueDraw();
+}
+
+nux::Geometry View::GetAbsoluteGeometry() const
+{
+  return impl_->GetAbsoluteGeometry();
+}
+
+// Returns the index of the icon at the given position, in window coordinates.
+// If there's no icon there, -1 is returned.
+int View::IconIndexAt(int x, int y)
+{
+  return impl_->IconIndexAt(x, y);
+}
+
+// Property setters
+void View::SetBackgroundColor(nux::Color const& color)
+{
+  impl_->SetBackgroundColor(color);
+}
+
+void View::SetMonitor(unsigned int monitor)
+{
+  impl_->SetMonitor(monitor);
+}
+
+void View::SetBorderSize(unsigned int size)
+{
+  impl_->SetBorderSize(size);
+}
+
+void View::SetFlatSpacing(int spacing)
+{
+  impl_->SetFlatSpacing(spacing);
+}
+
+void View::SetTextSize(unsigned int size)
+{
+  impl_->SetTextSize(size);
+}
+
+void View::SetIconSize(unsigned int size)
+{
+  impl_->SetIconSize(size);
+}
+
+void View::SetTileSize(unsigned int size)
+{
+  impl_->SetTileSize(size);
+}
+
+void View::SetAnimationLength(unsigned int length)
+{
+  impl_->SetAnimationLength(length);
+}
+
+void View::SetRenderBoxes(bool render)
+{
+  impl_->SetRenderBoxes(render);
+}
+
+// Property getters
+unsigned int View::GetBorderSize()
+{
+  return impl_->GetBorderSize();
+}
+
+unsigned int View::GetFlatSpacing()
+{
+  return impl_->GetFlatSpacing();
+}
+
+unsigned int View::GetTextSize()
+{
+  return impl_->GetTextSize();
+}
+
+unsigned int View::GetIconSize()
+{
+  return impl_->GetIconSize();
+}
+
+unsigned int View::GetTileSize()
+{
+  return impl_->GetTileSize();
+}
+
+unsigned int View::GetAnimationLength()
+{
+  return impl_->GetAnimationLength();
+}
+
+void View::SetupBackground(bool enabled)
+{
+  return impl_->SetupBackground(enabled);
+}
+
+View::Impl::Impl()
+{
+}
+
+NuxViewWrapper::NuxViewWrapper(const nux::ObjectPtr<NuxView> &nuxView)
+  : reference_(nuxView),
+    impl_(nuxView.GetPointer())
+{
+}
+
+
+ui::LayoutWindow::Vector NuxViewWrapper::ExternalTargets()
+{
+  return impl_->ExternalTargets();
+}
+
+void NuxViewWrapper::SetModel(SwitcherModel::Ptr model)
+{
+  impl_->SetModel(model);
+}
+
+SwitcherModel::Ptr NuxViewWrapper::GetModel()
+{
+  return impl_->GetModel();
+}
+
+View::MouseEventConnections
+NuxViewWrapper::ConnectToMouseEvents(View::MouseButtonCallback const& mouse_down_callback,
+                                     View::MouseButtonCallback const& mouse_up_callback,
+                                     View::MouseDragCallback const&   mouse_drag_callback)
+{
+  return impl_->ConnectToMouseEvents(mouse_down_callback,
+                                     mouse_up_callback,
+                                     mouse_drag_callback);
+}
+
+void NuxViewWrapper::QueueDraw()
+{
+  impl_->QueueDraw();
+}
+
+nux::Geometry NuxViewWrapper::GetAbsoluteGeometry() const
+{
+  return impl_->GetAbsoluteGeometry();
+}
+
+nux::Area * NuxViewWrapper::GetTopLevelViewWindow()
+{
+  return impl_->GetTopLevelViewWindow();
+}
+
+// Returns the index of the icon at the given position, in window coordinates.
+// If there's no icon there, -1 is returned.
+int NuxViewWrapper::IconIndexAt(int x, int y)
+{
+  return impl_->IconIndexAt(x, y);
+}
+
+// Property setters
+void NuxViewWrapper::SetBackgroundColor(nux::Color const& color)
+{
+  impl_->SetBackgroundColor(color);
+}
+
+void NuxViewWrapper::SetMonitor(unsigned int monitor)
+{
+  impl_->SetMonitor(monitor);
+}
+
+void NuxViewWrapper::SetBorderSize(unsigned int size)
+{
+  impl_->SetBorderSize(size);
+}
+
+void NuxViewWrapper::SetFlatSpacing(int spacing)
+{
+  impl_->SetFlatSpacing(spacing);
+}
+
+void NuxViewWrapper::SetTextSize(unsigned int size)
+{
+  impl_->SetTextSize(size);
+}
+
+void NuxViewWrapper::SetIconSize(unsigned int size)
+{
+  impl_->SetIconSize(size);
+}
+
+void NuxViewWrapper::SetTileSize(unsigned int size)
+{
+  impl_->SetTileSize(size);
+}
+
+void NuxViewWrapper::SetAnimationLength(unsigned int length)
+{
+  impl_->SetAnimationLength(length);
+}
+
+void NuxViewWrapper::SetRenderBoxes(bool render)
+{
+  impl_->SetRenderBoxes(render);
+}
+
+// Property getters
+unsigned int NuxViewWrapper::GetBorderSize()
+{
+  return impl_->GetBorderSize();
+}
+
+unsigned int NuxViewWrapper::GetFlatSpacing()
+{
+  return impl_->GetFlatSpacing();
+}
+
+unsigned int NuxViewWrapper::GetTextSize()
+{
+  return impl_->GetTextSize();
+}
+
+unsigned int NuxViewWrapper::GetIconSize()
+{
+  return impl_->GetIconSize();
+}
+
+unsigned int NuxViewWrapper::GetTileSize()
+{
+  return impl_->GetTileSize();
+}
+
+unsigned int NuxViewWrapper::GetAnimationLength()
+{
+  return impl_->GetAnimationLength();
+}
+
+void NuxViewWrapper::SetupBackground(bool enabled)
+{
+  return impl_->SetupBackground(enabled);
+}
+
+NUX_IMPLEMENT_OBJECT_TYPE(NuxView);
+
+NuxView::NuxView()
+  : UnityWindowView()
+  , switcher::View::Impl ()
+  , render_boxes(false)
   , border_size(50)
   , flat_spacing(10)
   , icon_size(128)
@@ -60,18 +332,28 @@
   text_view_->SetTextColor(nux::color::White);
   text_view_->SetFont("Ubuntu Bold 10");
 
-  icon_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnIconSizeChanged));
-  tile_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnTileSizeChanged));
+  icon_size.changed.connect (sigc::mem_fun (this, &NuxView::OnIconSizeChanged));
+  tile_size.changed.connect (sigc::mem_fun (this, &NuxView::OnTileSizeChanged));
 
   CaptureMouseDownAnyWhereElse(true);
 }
 
-std::string SwitcherView::GetName() const
+void NuxView::SetBackgroundColor(nux::Color const& color)
+{
+  background_color = color;
+}
+
+void NuxView::SetupBackground(bool enabled)
+{
+  UnityWindowView::SetupBackground(enabled);
+}
+
+std::string NuxView::GetName() const
 {
   return "SwitcherView";
 }
 
-void SwitcherView::AddProperties(GVariantBuilder* builder)
+void NuxView::AddProperties(GVariantBuilder* builder)
 {
   unity::variant::BuilderWrapper(builder)
   .add("render-boxes", render_boxes)
@@ -88,17 +370,17 @@
   .add("label_visible", text_view_->IsVisible());
 }
 
-LayoutWindow::Vector SwitcherView::ExternalTargets ()
+LayoutWindow::Vector NuxView::ExternalTargets ()
 {
   return render_targets_;
 }
 
-void SwitcherView::SetModel(SwitcherModel::Ptr model)
+void NuxView::SetModel(SwitcherModel::Ptr model)
 {
   model_ = model;
-  model->selection_changed.connect(sigc::mem_fun(this, &SwitcherView::OnSelectionChanged));
-  model->detail_selection.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionChanged));
-  model->detail_selection_index.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionIndexChanged));
+  model->selection_changed.connect(sigc::mem_fun(this, &NuxView::OnSelectionChanged));
+  model->detail_selection.changed.connect (sigc::mem_fun (this, &NuxView::OnDetailSelectionChanged));
+  model->detail_selection_index.changed.connect (sigc::mem_fun (this, &NuxView::OnDetailSelectionIndexChanged));
 
   if (!model->Selection())
     return;
@@ -109,30 +391,30 @@
     text_view_->SetText(model->Selection()->tooltip_text());
 }
 
-void SwitcherView::OnIconSizeChanged (int size)
+void NuxView::OnIconSizeChanged (int size)
 {
   icon_renderer_->SetTargetSize(tile_size, icon_size, 10);
 }
 
-void SwitcherView::OnTileSizeChanged (int size)
+void NuxView::OnTileSizeChanged (int size)
 {
   icon_renderer_->SetTargetSize(tile_size, icon_size, 10);
   vertical_size = tile_size + 80;
 }
 
-void SwitcherView::SaveLast ()
+void NuxView::SaveLast ()
 {
   saved_args_ = last_args_;
   saved_background_ = last_background_;
   clock_gettime(CLOCK_MONOTONIC, &save_time_);
 }
 
-void SwitcherView::OnDetailSelectionIndexChanged(unsigned int index)
+void NuxView::OnDetailSelectionIndexChanged(unsigned int index)
 {
   QueueDraw ();
 }
 
-void SwitcherView::OnDetailSelectionChanged(bool detail)
+void NuxView::OnDetailSelectionChanged (bool detail)
 {
   text_view_->SetVisible(!detail);
 
@@ -143,7 +425,7 @@
   QueueDraw();
 }
 
-void SwitcherView::OnSelectionChanged(AbstractLauncherIcon::Ptr const& selection)
+void NuxView::OnSelectionChanged(AbstractLauncherIcon::Ptr const& selection)
 {
   if (selection)
     text_view_->SetText(selection->tooltip_text());
@@ -152,12 +434,12 @@
   QueueDraw();
 }
 
-SwitcherModel::Ptr SwitcherView::GetModel()
+SwitcherModel::Ptr NuxView::GetModel()
 {
   return model_;
 }
 
-RenderArg SwitcherView::CreateBaseArgForIcon(AbstractLauncherIcon::Ptr const& icon)
+RenderArg NuxView::CreateBaseArgForIcon(AbstractLauncherIcon::Ptr const& icon)
 {
   RenderArg arg;
   arg.icon = icon.GetPointer();
@@ -185,7 +467,7 @@
   return arg;
 }
 
-RenderArg SwitcherView::InterpolateRenderArgs(RenderArg const& start, RenderArg const& end, float progress)
+RenderArg NuxView::InterpolateRenderArgs(RenderArg const& start, RenderArg const& end, float progress)
 {
   // easing
   progress = -pow(progress - 1.0f, 2) + 1;
@@ -205,7 +487,7 @@
   return result;
 }
 
-nux::Geometry SwitcherView::InterpolateBackground (nux::Geometry const& start, nux::Geometry const& end, float progress)
+nux::Geometry NuxView::InterpolateBackground (nux::Geometry const& start, nux::Geometry const& end, float progress)
 {
   progress = -pow(progress - 1.0f, 2) + 1;
 
@@ -219,7 +501,7 @@
   return result;
 }
 
-nux::Geometry SwitcherView::UpdateRenderTargets(nux::Point const& center, timespec const& current)
+nux::Geometry NuxView::UpdateRenderTargets (nux::Point const& center, timespec const& current)
 {
   std::vector<Window> const& xids = model_->DetailXids();
 
@@ -262,7 +544,7 @@
   return final_bounds;
 }
 
-void SwitcherView::OffsetRenderTargets (int x, int y)
+void NuxView::OffsetRenderTargets (int x, int y)
 {
   for (LayoutWindow::Ptr const& target : render_targets_)
   {
@@ -271,7 +553,7 @@
   }
 }
 
-nux::Size SwitcherView::SpreadSize()
+nux::Size NuxView::SpreadSize()
 {
   nux::Geometry const& base = GetGeometry();
   nux::Size result(base.width - border_size * 2, base.height - border_size * 2);
@@ -282,7 +564,7 @@
   return result;
 }
 
-void SwitcherView::GetFlatIconPositions (int n_flat_icons,
+void NuxView::GetFlatIconPositions (int n_flat_icons,
                                          int size,
                                          int selection,
                                          int &first_flat,
@@ -356,7 +638,7 @@
   }
 }
 
-std::list<RenderArg> SwitcherView::RenderArgsFlat(nux::Geometry& background_geo, int selection, timespec const& current)
+std::list<RenderArg> NuxView::RenderArgsFlat(nux::Geometry& background_geo, int selection, timespec const& current)
 {
   std::list<RenderArg> results;
   nux::Geometry const& base = GetGeometry();
@@ -506,7 +788,7 @@
   return results;
 }
 
-void SwitcherView::PreDraw(nux::GraphicsEngine& GfxContext, bool force_draw)
+void NuxView::PreDraw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   clock_gettime(CLOCK_MONOTONIC, &current_);
 
@@ -523,12 +805,22 @@
   icon_renderer_->PreprocessIcons(last_args_, GetGeometry());
 }
 
-nux::Geometry SwitcherView::GetBackgroundGeometry()
+nux::Geometry NuxView::GetBackgroundGeometry()
 {
   return last_background_;
 }
 
-void SwitcherView::DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry internal_clip)
+void NuxView::QueueDraw()
+{
+  ui::UnityWindowView::QueueDraw();
+}
+
+nux::Geometry NuxView::GetAbsoluteGeometry() const
+{
+  return ui::UnityWindowView::GetAbsoluteGeometry();
+}
+
+void NuxView::DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry internal_clip)
 {
   nux::Geometry base = GetGeometry();
 
@@ -600,7 +892,7 @@
   animation_draw_ = false;
 }
 
-int SwitcherView::IconIndexAt(int x, int y)
+int NuxView::IconIndexAt(int x, int y)
 {
   int half_size = icon_size.Get() / 2;
   int icon_index = -1;
@@ -633,5 +925,88 @@
   return icon_index;
 }
 
+NuxView::MouseEventConnections
+NuxView::ConnectToMouseEvents(const MouseButtonCallback &mouse_down_callback,
+                              const MouseButtonCallback &mouse_up_callback,
+                              const MouseDragCallback   &mouse_drag_callback)
+{
+  return NuxView::MouseEventConnections
+      (mouse_down.connect (mouse_down_callback),
+       mouse_up.connect (mouse_up_callback),
+       mouse_drag.connect (mouse_drag_callback));
+}
+
+}
+
+// Property setters
+void NuxView::SetMonitor(unsigned int monitor_id)
+{
+  monitor = monitor_id;
+}
+
+void NuxView::SetBorderSize(unsigned int size)
+{
+  border_size = size;
+}
+
+void NuxView::SetFlatSpacing(int spacing)
+{
+  flat_spacing = spacing;
+}
+
+void NuxView::SetTextSize(unsigned int size)
+{
+  text_size = size;
+}
+
+void NuxView::SetIconSize(unsigned int size)
+{
+  icon_size = size;
+}
+
+void NuxView::SetTileSize(unsigned int size)
+{
+  tile_size = size;
+}
+
+void NuxView::SetAnimationLength(unsigned int length)
+{
+  animation_length = length;
+}
+
+void NuxView::SetRenderBoxes(bool render)
+{
+  render_boxes = render;
+}
+
+// Property getters
+unsigned int NuxView::GetBorderSize()
+{
+  return border_size;
+}
+
+unsigned int NuxView::GetFlatSpacing()
+{
+  return flat_spacing;
+}
+
+unsigned int NuxView::GetTextSize()
+{
+  return text_size;
+}
+
+unsigned int NuxView::GetIconSize()
+{
+  return icon_size;
+}
+
+unsigned int NuxView::GetTileSize()
+{
+  return tile_size;
+}
+
+unsigned int NuxView::GetAnimationLength()
+{
+  return animation_length;
 }
 }
 
=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2012-12-14 12:14:34 +0000
+++ launcher/SwitcherView.h	2012-12-20 16:52:21 +0000
@@ -20,6 +20,8 @@
 #ifndef SWITCHERVIEW_H
 #define SWITCHERVIEW_H
 
+#include <tuple>
+
 #include "SwitcherModel.h"
 #include "unity-shared/AbstractIconRenderer.h"
 #include "unity-shared/StaticCairoText.h"
@@ -41,73 +43,204 @@
 }
 namespace switcher
 {
-
-class SwitcherView : public ui::UnityWindowView
-{
-  NUX_DECLARE_OBJECT_TYPE(SwitcherView, ui::UnityWindowView);
-public:
-  typedef nux::ObjectPtr<SwitcherView> Ptr;
-
-  SwitcherView();
+class View
+{
+  public:
+
+    typedef sigc::slot<void, int, int, int, int> MouseButtonCallback;
+    typedef sigc::slot <void, int, int, int, int, unsigned int, unsigned int> MouseDragCallback;
+
+    typedef std::tuple <sigc::connection,
+                        sigc::connection,
+                        sigc::connection> MouseEventConnections;
+
+    class Impl;
+    typedef std::unique_ptr<Impl> ImplPtr;
+    typedef std::shared_ptr<View> Ptr;
+    typedef std::function<ImplPtr()> ViewFactoryFunc;
+
+    View(ViewFactoryFunc const&);
+
+    ui::LayoutWindow::Vector ExternalTargets();
+
+    void SetModel(SwitcherModel::Ptr model);
+    SwitcherModel::Ptr GetModel();
+
+    MouseEventConnections ConnectToMouseEvents(const MouseButtonCallback &mouse_down_callback,
+                                               const MouseButtonCallback &mouse_up_callback,
+                                               const MouseDragCallback   &mouse_drag_callback);
+    void QueueDraw();
+    nux::Geometry GetAbsoluteGeometry() const;
+
+    // Returns the index of the icon at the given position, in window coordinates.
+    // If there's no icon there, -1 is returned.
+    int IconIndexAt(int x, int y);
+
+    // Property setters
+    void SetBackgroundColor(nux::Color const& color);
+    void SetMonitor(unsigned int monitor);
+    void SetBorderSize(unsigned int);
+    void SetFlatSpacing(int);
+    void SetTextSize(unsigned int);
+    void SetIconSize(unsigned int);
+    void SetTileSize(unsigned int);
+    void SetAnimationLength(unsigned int);
+    void SetRenderBoxes(bool);
+
+    // Property getters
+    unsigned int GetBorderSize();
+    unsigned int GetFlatSpacing();
+    unsigned int GetTextSize();
+    unsigned int GetIconSize();
+    unsigned int GetTileSize();
+    unsigned int GetAnimationLength();
+
+    void SetupBackground(bool enabled = true);
+
+  private:
+    std::unique_ptr<Impl> impl_;
+};
+
+class View::Impl
+{
+public:
+
+  typedef switcher::View::MouseButtonCallback MouseButtonCallback;
+  typedef switcher::View::MouseDragCallback MouseDragCallback;
+  typedef switcher::View::MouseEventConnections MouseEventConnections;
+
+  Impl();
+
+  virtual ~Impl() {};
+
+  virtual ui::LayoutWindow::Vector ExternalTargets() = 0;
+
+  virtual void SetModel(SwitcherModel::Ptr model) = 0;
+  virtual SwitcherModel::Ptr GetModel() = 0;
+
+  virtual MouseEventConnections ConnectToMouseEvents(const MouseButtonCallback &mouse_down_callback,
+                                                     const MouseButtonCallback &mouse_up_callback,
+                                                     const MouseDragCallback   &mouse_drag_callback) = 0;
+  virtual void QueueDraw() = 0;
+  virtual nux::Geometry GetAbsoluteGeometry() const = 0;
+
+  // Returns the index of the icon at the given position, in window coordinates.
+  // If there's no icon there, -1 is returned.
+  virtual int IconIndexAt(int x, int y) = 0;
+
+  // Property setters
+  virtual void SetBackgroundColor(nux::Color const& color) = 0;
+  virtual void SetMonitor(unsigned int monitor) = 0;
+  virtual void SetBorderSize(unsigned int) = 0;
+  virtual void SetFlatSpacing(int) = 0;
+  virtual void SetTextSize(unsigned int) = 0;
+  virtual void SetIconSize(unsigned int) = 0;
+  virtual void SetTileSize(unsigned int) = 0;
+  virtual void SetAnimationLength(unsigned int) = 0;
+  virtual void SetRenderBoxes(bool) = 0;
+
+  // Property getters
+  virtual unsigned int GetBorderSize() = 0;
+  virtual unsigned int GetFlatSpacing() = 0;
+  virtual unsigned int GetTextSize() = 0;
+  virtual unsigned int GetIconSize() = 0;
+  virtual unsigned int GetTileSize() = 0;
+  virtual unsigned int GetAnimationLength() = 0;
+  virtual void SetupBackground(bool enabled) = 0;
+};
+
+class NuxView : public ui::UnityWindowView,
+                public unity::switcher::View::Impl
+{
+  NUX_DECLARE_OBJECT_TYPE(NuxView, ui::UnityWindowView);
+public:
+
+  NuxView();
 
   ui::LayoutWindow::Vector ExternalTargets();
 
   void SetModel(SwitcherModel::Ptr model);
   SwitcherModel::Ptr GetModel();
 
-  nux::Property<bool> render_boxes;
-  nux::Property<int> border_size;
-  nux::Property<int> flat_spacing;
-  nux::Property<int> icon_size;
-  nux::Property<int> minimum_spacing;
-  nux::Property<int> tile_size;
-  nux::Property<int> vertical_size;
-  nux::Property<int> text_size;
-  nux::Property<int> animation_length;
-  nux::Property<int> monitor;
-  nux::Property<double> spread_size;
-
   // Returns the index of the icon at the given position, in window coordinates.
   // If there's no icon there, -1 is returned.
   int IconIndexAt(int x, int y);
 
+  MouseEventConnections ConnectToMouseEvents(MouseButtonCallback const& mouse_down_callback,
+                                             MouseButtonCallback const& mouse_up_callback,
+                                             MouseDragCallback const&   mouse_drag_callback);
+
 protected:
   // Introspectable methods
+  void SetupBackground(bool enabled);
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
   void PreDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry clip);
+  void QueueDraw();
+  nux::Geometry GetAbsoluteGeometry() const;
   nux::Geometry GetBackgroundGeometry();
 
   ui::RenderArg InterpolateRenderArgs(ui::RenderArg const& start, ui::RenderArg const& end, float progress);
-  nux::Geometry InterpolateBackground (nux::Geometry const& start, nux::Geometry const& end, float progress);
+  nux::Geometry InterpolateBackground(nux::Geometry const& start, nux::Geometry const& end, float progress);
 
   std::list<ui::RenderArg> RenderArgsFlat(nux::Geometry& background_geo, int selection, timespec const& current);
 
   ui::RenderArg CreateBaseArgForIcon(launcher::AbstractLauncherIcon::Ptr const& icon);
 private:
   void OnSelectionChanged(launcher::AbstractLauncherIcon::Ptr const& selection);
-  void OnDetailSelectionChanged (bool detail);
-  void OnDetailSelectionIndexChanged (unsigned int index);
-
-  void OnIconSizeChanged (int size);
-  void OnTileSizeChanged (int size);
-
-  nux::Geometry UpdateRenderTargets (nux::Point const& center, timespec const& current);
-  void OffsetRenderTargets (int x, int y);
-
-  nux::Size SpreadSize ();
-
-  void GetFlatIconPositions (int n_flat_icons, 
-                             int size, 
-                             int selection, 
-                             int &first_flat, 
-                             int &last_flat, 
-                             int &half_fold_left, 
-                             int &half_fold_right);
-
-  void SaveLast ();
+  void OnDetailSelectionChanged(bool detail);
+  void OnDetailSelectionIndexChanged(unsigned int index);
+
+  void OnIconSizeChanged(int size);
+  void OnTileSizeChanged(int size);
+
+  nux::Geometry UpdateRenderTargets(nux::Point const& center, timespec const& current);
+  void OffsetRenderTargets(int x, int y);
+
+  nux::Size SpreadSize();
+
+  void GetFlatIconPositions(int n_flat_icons,
+                            int size,
+                            int selection,
+                            int &first_flat,
+                            int &last_flat,
+                            int &half_fold_left,
+                            int &half_fold_right);
+
+  void SaveLast();
+
+  // Property setters
+  void SetBackgroundColor(nux::Color const& color);
+  void SetMonitor(unsigned int monitor);
+  void SetBorderSize(unsigned int);
+  void SetFlatSpacing(int);
+  void SetTextSize(unsigned int);
+  void SetIconSize(unsigned int);
+  void SetTileSize(unsigned int);
+  void SetAnimationLength(unsigned int);
+  void SetRenderBoxes(bool);
+
+  // Property getters
+  unsigned int GetBorderSize();
+  unsigned int GetFlatSpacing();
+  unsigned int GetTextSize();
+  unsigned int GetIconSize();
+  unsigned int GetTileSize();
+  unsigned int GetAnimationLength();
+
+  nux::Property<bool> render_boxes;
+  nux::Property<int> border_size;
+  nux::Property<int> flat_spacing;
+  nux::Property<int> icon_size;
+  nux::Property<int> minimum_spacing;
+  nux::Property<int> tile_size;
+  nux::Property<int> vertical_size;
+  nux::Property<int> text_size;
+  nux::Property<int> animation_length;
+  nux::Property<int> monitor;
+  nux::Property<double> spread_size;
 
   SwitcherModel::Ptr model_;
   ui::LayoutSystem layout_system_;
@@ -132,6 +265,53 @@
   glib::Source::UniquePtr redraw_idle_;
 };
 
+class NuxViewWrapper : public unity::switcher::View::Impl
+{
+  public:
+
+    NuxViewWrapper(nux::ObjectPtr<NuxView> const& nuxView);
+
+    ui::LayoutWindow::Vector ExternalTargets();
+
+    void SetModel(SwitcherModel::Ptr model);
+    SwitcherModel::Ptr GetModel();
+
+    MouseEventConnections ConnectToMouseEvents(const MouseButtonCallback &mouse_down_callback,
+                                               const MouseButtonCallback &mouse_up_callback,
+                                               const MouseDragCallback   &mouse_drag_callback);
+    void QueueDraw();
+    nux::Geometry GetAbsoluteGeometry() const;
+
+    // Returns the index of the icon at the given position, in window coordinates.
+    // If there's no icon there, -1 is returned.
+    int IconIndexAt(int x, int y);
+
+    // Property setters
+    void SetBackgroundColor(nux::Color const& color);
+    void SetMonitor(unsigned int monitor);
+    void SetBorderSize(unsigned int);
+    void SetFlatSpacing(int);
+    void SetTextSize(unsigned int);
+    void SetIconSize(unsigned int);
+    void SetTileSize(unsigned int);
+    void SetAnimationLength(unsigned int);
+    void SetRenderBoxes(bool);
+
+    // Property getters
+    unsigned int GetBorderSize();
+    unsigned int GetFlatSpacing();
+    unsigned int GetTextSize();
+    unsigned int GetIconSize();
+    unsigned int GetTileSize();
+    unsigned int GetAnimationLength();
+
+    void SetupBackground(bool enabled = true);
+
+    nux::Area * GetTopLevelViewWindow();
+  private:
+    nux::ObjectPtr<nux::Object> reference_;
+    unity::switcher::View::Impl *impl_;
+};
 }
 }
 
 
=== modified file 'plugins/unityshell/src/GesturalWindowSwitcher.cpp'
--- plugins/unityshell/src/GesturalWindowSwitcher.cpp	2012-12-20 16:52:21 +0000
+++ plugins/unityshell/src/GesturalWindowSwitcher.cpp	2012-12-20 16:52:21 +0000
@@ -335,7 +335,7 @@
 
   state = State::RecognizingMouseClickOrDrag;
 
-  unity::switcher::SwitcherView *view = switcher_controller->GetView();
+  unity::switcher::View *view = switcher_controller->GetView();
 
   index_icon_hit = view->IconIndexAt(x, y);
   accumulated_horizontal_drag = 0.0f;
@@ -413,17 +413,17 @@
 
 void GesturalWindowSwitcherPrivate::ConnectToSwitcherViewMouseEvents()
 {
-  unity::switcher::SwitcherView *switcher_view = switcher_controller->GetView();
+  unity::switcher::View *switcher_view = switcher_controller->GetView();
   g_assert(switcher_view);
 
-  mouse_down_connection = switcher_view->mouse_down.connect(
-      sigc::mem_fun(this, &GesturalWindowSwitcherPrivate::ProcessSwitcherViewMouseDown));
-
-  mouse_up_connection = switcher_view->mouse_up.connect(
-      sigc::mem_fun(this, &GesturalWindowSwitcherPrivate::ProcessSwitcherViewMouseUp));
-
-  mouse_drag_connection = switcher_view->mouse_drag.connect(
+  auto connections =
+    switcher_view->ConnectToMouseEvents(sigc::mem_fun(this, &GesturalWindowSwitcherPrivate::ProcessSwitcherViewMouseDown),
+      sigc::mem_fun(this, &GesturalWindowSwitcherPrivate::ProcessSwitcherViewMouseUp),
       sigc::mem_fun(this, &GesturalWindowSwitcherPrivate::ProcessSwitcherViewMouseDrag));
+
+  std::tie (mouse_down_connection,
+            mouse_up_connection,
+            mouse_drag_connection) = connections;
 }
 
 ///////////////////////////////////////////
 
=== modified file 'plugins/unityshell/src/unity-switcher-accessible.cpp'
--- plugins/unityshell/src/unity-switcher-accessible.cpp	2012-10-11 01:44:15 +0000
+++ plugins/unityshell/src/unity-switcher-accessible.cpp	2012-12-20 16:52:21 +0000
@@ -139,7 +139,7 @@
 {
   AtkObject* accessible = NULL;
 
-  g_return_val_if_fail(dynamic_cast<SwitcherView*>(object), NULL);
+  g_return_val_if_fail(dynamic_cast<NuxView*>(object), NULL);
 
   accessible = ATK_OBJECT(g_object_new(UNITY_TYPE_SWITCHER_ACCESSIBLE, NULL));
 
@@ -154,7 +154,7 @@
 unity_switcher_accessible_initialize(AtkObject* accessible,
                                      gpointer data)
 {
-  SwitcherView* switcher = NULL;
+  NuxView* switcher = NULL;
   nux::Object* nux_object = NULL;
   UnitySwitcherAccessible* self = NULL;
   SwitcherModel::Ptr model;
@@ -165,7 +165,7 @@
 
   self = UNITY_SWITCHER_ACCESSIBLE(accessible);
   nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
-  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher = dynamic_cast<NuxView*>(nux_object);
   if (switcher == NULL)
     return;
 
@@ -276,7 +276,7 @@
 unity_switcher_accessible_ref_selection(AtkSelection* selection,
                                         gint i)
 {
-  SwitcherView* switcher = NULL;
+  NuxView* switcher = NULL;
   SwitcherModel::Ptr switcher_model;
   nux::Object* nux_object = NULL;
   gint selected_index = 0;
@@ -292,7 +292,7 @@
   if (!nux_object) /* state is defunct */
     return 0;
 
-  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher = dynamic_cast<NuxView*>(nux_object);
 
   switcher_model = switcher->GetModel();
   selected_index = switcher_model->SelectionIndex();
@@ -309,7 +309,7 @@
 static gint
 unity_switcher_accessible_get_selection_count(AtkSelection* selection)
 {
-  SwitcherView* switcher = NULL;
+  NuxView* switcher = NULL;
   SwitcherModel::Ptr switcher_model;
   nux::Object* nux_object = NULL;
 
@@ -319,7 +319,7 @@
   if (!nux_object) /* state is defunct */
     return 0;
 
-  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher = dynamic_cast<NuxView*>(nux_object);
   switcher_model = switcher->GetModel();
 
   if (!switcher_model->Selection())
@@ -332,7 +332,7 @@
 unity_switcher_accessible_is_child_selected(AtkSelection* selection,
                                             gint i)
 {
-  SwitcherView* switcher = NULL;
+  NuxView* switcher = NULL;
   SwitcherModel::Ptr switcher_model;
   SwitcherModel::iterator it;
   nux::Object* nux_object = NULL;
@@ -344,7 +344,7 @@
   if (!nux_object) /* state is defunct */
     return 0;
 
-  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher = dynamic_cast<NuxView*>(nux_object);
   switcher_model = switcher->GetModel();
   selected_index = switcher_model->SelectionIndex();
 
@@ -385,7 +385,7 @@
 {
   gint index = 0;
   nux::Object* nux_object = NULL;
-  SwitcherView* switcher = NULL;
+  NuxView* switcher = NULL;
   SwitcherModel::iterator it;
   AtkObject* child_accessible = NULL;
 
@@ -393,7 +393,7 @@
   if (!nux_object) /* state is defunct */
     return;
 
-  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher = dynamic_cast<NuxView*>(nux_object);
   SwitcherModel::Ptr const& switcher_model = switcher->GetModel();
 
   if (!switcher_model)
 
=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp	2012-12-14 12:14:34 +0000
+++ plugins/unityshell/src/unitya11y.cpp	2012-12-20 16:52:21 +0000
@@ -183,7 +183,7 @@
   if (object->Type().IsDerivedFromType(unity::SearchBar::StaticObjectType))
     return unity_search_bar_accessible_new(object);
 
-  if (object->Type().IsDerivedFromType(unity::switcher::SwitcherView::StaticObjectType))
+  if (object->Type().IsDerivedFromType(unity::switcher::NuxView::StaticObjectType))
     return unity_switcher_accessible_new(object);
 
   /* NUX classes  */
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-12-20 16:52:21 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-12-20 16:52:21 +0000
@@ -1438,7 +1438,7 @@
 
   if (switcher_controller_ && switcher_controller_->Visible())
   {
-    unity::switcher::SwitcherView* view = switcher_controller_->GetView();
+    unity::switcher::View* view = switcher_controller_->GetView();
 
     if (G_LIKELY(view))
     {
 
=== modified file 'tests/MockSwitcherController.h'
--- tests/MockSwitcherController.h	2012-12-20 16:52:21 +0000
+++ tests/MockSwitcherController.h	2012-12-20 16:52:21 +0000
@@ -43,7 +43,7 @@
   MOCK_METHOD0(Next, void());
   MOCK_METHOD0(Prev, void());
   MOCK_METHOD1(Select, void(int));
-  MOCK_METHOD0(GetView, unity::switcher::SwitcherView * ());
+  MOCK_METHOD0(GetView, unity::switcher::View * ());
   MOCK_CONST_METHOD1(CanShowSwitcher, bool(const std::vector<launcher::AbstractLauncherIcon::Ptr> &));
   MOCK_METHOD0(NextDetail, void());
   MOCK_METHOD0(PrevDetail, void());
 
=== modified file 'tests/StubSwitcherController.h'
--- tests/StubSwitcherController.h	2012-12-20 16:52:21 +0000
+++ tests/StubSwitcherController.h	2012-12-20 16:52:21 +0000
@@ -59,12 +59,12 @@
       Reset ();
     };
 
-    void SetView (SwitcherView *view)
+    void SetView (View *view)
     {
       mock_view_ = view;
     }
 
-    SwitcherView * GetView ()
+    View * GetView ()
     {
       return mock_view_;
     }
@@ -147,7 +147,7 @@
     int index_selected_;
 
   private:
-    SwitcherView *mock_view_;
+    View *mock_view_;
 };
 }
 }
 
=== modified file 'tests/test-gestures/SwitcherControllerMock.h'
--- tests/test-gestures/SwitcherControllerMock.h	2012-12-20 16:52:21 +0000
+++ tests/test-gestures/SwitcherControllerMock.h	2012-12-20 16:52:21 +0000
@@ -24,13 +24,42 @@
 namespace unity {
 namespace switcher {
 
-class SwitcherViewMock : public nux::ViewMock
+class ViewMock
+{
+  public:
+
+    typedef sigc::slot<void, int, int, int, int> MouseButtonCallback;
+    typedef sigc::slot <void, int, int, int, int, unsigned int, unsigned int> MouseDragCallback;
+
+    typedef std::tuple <sigc::connection,
+                        sigc::connection,
+                        sigc::connection> MouseEventConnections;
+
+    virtual int IconIndexAt(int x, int y) = 0;
+
+    virtual MouseEventConnections ConnectToMouseEvents (const MouseButtonCallback &mouse_down_callback,
+                                                        const MouseButtonCallback &mouse_up_callback,
+                                                        const MouseDragCallback   &mouse_drag_callback) = 0;
+
+
+};
+
+class NuxViewMock : public nux::ViewMock, public switcher::ViewMock
 {
 public:
   int IconIndexAt(int x, int y)
   {
     return x*y;
   }
+
+  MouseEventConnections ConnectToMouseEvents (const MouseButtonCallback &mouse_down_callback,
+                                              const MouseButtonCallback &mouse_up_callback,
+                                              const MouseDragCallback   &mouse_drag_callback)
+  {
+    return MouseEventConnections (mouse_down.connect (mouse_down_callback),
+                                  mouse_up.connect (mouse_up_callback),
+                                  mouse_drag.connect (mouse_drag_callback));
+  }
 };
 
 class ControllerMock
@@ -78,7 +107,7 @@
     is_visible_ = false;
   }
 
-  SwitcherViewMock *GetView()
+  ViewMock *GetView()
   {
     return &view_;
   }
@@ -89,7 +118,7 @@
   }
 
   bool is_visible_;
-  SwitcherViewMock view_;
+  NuxViewMock view_;
   int prev_count_;
   int next_count_;
   int index_selected_;
 
=== modified file 'tests/test-gestures/sed_script_switcher'
--- tests/test-gestures/sed_script_switcher	2012-07-27 20:24:01 +0000
+++ tests/test-gestures/sed_script_switcher	2012-12-20 16:52:21 +0000
@@ -22,4 +22,5 @@
 s|\<SwitcherController\>|SwitcherControllerMock|g
 s|\<switcher\:\:Controller\>|switcher\:\:ControllerMock|g
 s|\<launcher\:\:Controller\>|launcher\:\:ControllerMock|g
-s|\<SwitcherView\>|SwitcherViewMock|g
+s|\<switcher\:\:View\>|switcher\:\:ViewMock|g
+s|\<switcher\:\:NuxView\>|switcher\:\:NuxViewMock|g
 
=== modified file 'tests/test-gestures/test_gestural_window_switcher.cpp'
--- tests/test-gestures/test_gestural_window_switcher.cpp	2012-08-14 12:48:21 +0000
+++ tests/test-gestures/test_gestural_window_switcher.cpp	2012-12-20 16:52:21 +0000
@@ -290,7 +290,7 @@
 
 TEST_F(GesturalWindowSwitcherTest, MouseDragAfterTapAndHoldSelectsNextWindow)
 {
-  unity::switcher::SwitcherViewMock &switcher_view =
+  unity::switcher::NuxViewMock &switcher_view =
     unity_screen->switcher_controller()->view_;
   int drag_delta = GesturalWindowSwitcher::DRAG_DELTA_FOR_CHANGING_SELECTION * 1.5f;