Merged with trunk.

(bzr r3008.37.1)

UnityCore/ModelIterator-inl.h

@@ -136,14 +136,14 @@ Adaptor& ModelIterator<Adaptor>::operator*()
 }
 
 template<class Adaptor>
-bool const ModelIterator<Adaptor>::IsLast()
+bool ModelIterator<Adaptor>::IsLast()
 {
   if (!model_) return true;
   return (dee_model_is_last(model_, iter_));
 }
 
 template<class Adaptor>
-bool const ModelIterator<Adaptor>::IsFirst()
+bool ModelIterator<Adaptor>::IsFirst()
 {
   if (!model_) return true;
   return (dee_model_is_first(model_, iter_));

UnityCore/ModelIterator.h

@@ -53,27 +53,27 @@ class ModelIterator : public std::iterator<std::random_access_iterator_tag, Adap
   ModelIterator  operator-(int value) const;
 
   ModelIterator operator[](int value);
-  friend inline bool const operator<(const ModelIterator& lhs, const ModelIterator& rhs)
+  friend inline bool operator<(const ModelIterator& lhs, const ModelIterator& rhs)
   {
     return (dee_model_get_position(lhs.model_, lhs.iter_) < dee_model_get_position(rhs.model_, rhs.iter_));
   }
 
-  friend inline bool const operator>(const ModelIterator& lhs, const ModelIterator& rhs)
+  friend inline bool operator>(const ModelIterator& lhs, const ModelIterator& rhs)
   {
     return (dee_model_get_position(lhs.model_, lhs.iter_) > dee_model_get_position(rhs.model_, rhs.iter_));
   }
 
-  friend inline bool const operator<=(const ModelIterator& lhs, const ModelIterator& rhs)
+  friend inline bool operator<=(const ModelIterator& lhs, const ModelIterator& rhs)
   {
     return (dee_model_get_position(lhs.model_, lhs.iter_) <= dee_model_get_position(rhs.model_, rhs.iter_));
   }
 
-  friend inline bool const operator>=(const ModelIterator& lhs, const ModelIterator& rhs)
+  friend inline bool operator>=(const ModelIterator& lhs, const ModelIterator& rhs)
   {
     return (dee_model_get_position(lhs.model_, lhs.iter_) >= dee_model_get_position(rhs.model_, rhs.iter_));
   }
 
-  friend inline bool const operator==(const ModelIterator& lhs, const ModelIterator& rhs)
+  friend inline bool operator==(const ModelIterator& lhs, const ModelIterator& rhs)
   {
     return (lhs.iter_ == rhs.iter_);
   }
@@ -85,8 +85,8 @@ class ModelIterator : public std::iterator<std::random_access_iterator_tag, Adap
   Adaptor& operator*();
 
   /* convenience methods */
-  bool const IsLast();
-  bool const IsFirst();
+  bool IsLast();
+  bool IsFirst();
 
 private:
   glib::Object<DeeModel> model_;

dash/CoverflowResultView.cpp

@@ -251,11 +251,10 @@ void CoverflowResultView::DrawContent(nux::GraphicsEngine& GfxContext, bool forc
   GfxContext.PushClippingRectangle(base);
 
   if (RedirectedAncestor())
-    graphics::ClearGeometry(GetGeometry());
+    graphics::ClearGeometry(base);
 
   if (GetCompositionLayout())
   {
-    nux::Geometry geo = GetCompositionLayout()->GetGeometry();
     GetCompositionLayout()->ProcessDraw(GfxContext, force_draw);
   }
 

dash/DashController.cpp

@@ -152,8 +152,6 @@ void Controller::SetupDashView()
   window_->SetLayout(layout);
 
   window_->UpdateInputWindowGeometry();
-
-  ubus_manager_.UnregisterInterest(place_entry_request_id_);
 }
 
 void Controller::RegisterUBusInterests()
@@ -162,9 +160,6 @@ void Controller::RegisterUBusInterests()
                                  sigc::mem_fun(this, &Controller::OnExternalShowDash));
   ubus_manager_.RegisterInterest(UBUS_OVERLAY_CLOSE_REQUEST,
                                  sigc::mem_fun(this, &Controller::OnExternalHideDash));
-  place_entry_request_id_ =
-    ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
-                                   sigc::mem_fun(this, &Controller::OnActivateRequest));
   ubus_manager_.RegisterInterest(UBUS_DASH_ABOUT_TO_SHOW,
                                  [&] (GVariant*) { EnsureDash(); });
   ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, [&] (GVariant *data)
@@ -465,6 +460,11 @@ bool Controller::IsVisible() const
   return visible_;
 }
 
+bool Controller::IsCommandLensOpen() const
+{
+  return visible_ && view_->IsCommandLensOpen();
+}
+
 nux::Geometry Controller::GetInputWindowGeometry()
 {
   EnsureDash();

dash/DashController.h

@@ -65,6 +65,7 @@ class Controller : public unity::debug::Introspectable
   void ReFocusKeyInput();
 
   bool IsVisible() const;
+  bool IsCommandLensOpen() const;
   nux::Geometry GetInputWindowGeometry();
 
 protected:
@@ -104,7 +105,6 @@ class Controller : public unity::debug::Introspectable
   DashView* view_;
 
   sigc::connection screen_ungrabbed_slot_;
-  unsigned place_entry_request_id_;
   glib::DBusServer dbus_server_;
   glib::TimeoutSeconds ensure_timeout_;
   nux::animation::AnimateValue<double> timeline_animator_;

dash/DashView.cpp

@@ -180,6 +180,12 @@ void DashView::SetMonitorOffset(int x, int y)
   renderer_.y_offset = y;
 }
 
+bool DashView::IsCommandLensOpen() const
+{
+  return (scope_bar_->GetActiveScopeId() == "commands.scope");
+}
+
+
 void DashView::OnResultActivated(ResultView::ActivateType type, LocalResult const& local_result, GVariant* data, std::string const& unique_id) 
 {
   last_activated_result_ = local_result;
@@ -653,7 +659,7 @@ void DashView::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
   renderer_geo.y += panel_style.panel_height;
   renderer_geo.height += panel_style.panel_height;
 
-  renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, true);
+  renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, false);
 }
 
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)

dash/DashView.h

@@ -68,6 +68,8 @@ class DashView : public nux::View, public unity::debug::Introspectable
   void OnActivateRequest(GVariant* args);
   void SetMonitorOffset(int x, int y);
 
+  bool IsCommandLensOpen() const;
+
   std::string const GetIdForShortcutActivation(std::string const& shortcut) const;
   std::vector<char> GetAllShortcuts();
 

dash/FilterMultiRangeWidget.cpp

@@ -279,11 +279,6 @@ void FilterMultiRangeWidget::RecvMouseDrag(int x, int y, int dx, int dy, unsigne
     return;
   dragging_ = true;
 
-  nux::Geometry mouse_down_button_geometry = mouse_down_button_->GetAbsoluteGeometry();
-
-  nux::Geometry left_active_button_geometry = mouse_down_left_active_button_->GetAbsoluteGeometry();
-  nux::Geometry right_active_button_geometry = mouse_down_right_active_button_->GetAbsoluteGeometry();
-
   auto end = buttons_.end();
   int found_buttons = 0;
   for (auto iter = buttons_.begin(); iter != end; ++iter)

dash/ResultViewGrid.cpp

@@ -764,7 +764,6 @@ void ResultViewGrid::DrawContent(nux::GraphicsEngine& GfxContext, bool force_dra
 
   if (GetCompositionLayout())
   {
-    nux::Geometry geo = GetCompositionLayout()->GetGeometry();
     GetCompositionLayout()->ProcessDraw(GfxContext, force_draw);
   }
 

dash/ScopeBar.cpp

@@ -364,5 +364,15 @@ void ScopeBar::AddProperties(GVariantBuilder* builder)
   }
 }
 
+std::string ScopeBar::GetActiveScopeId() const
+{
+  for (auto icon : icons_)
+  {
+    if (icon->active)
+      return icon->id;
+  }
+  return "";
+}
+
 }
 }

dash/ScopeBar.h

@@ -62,6 +62,8 @@ class ScopeBar : public nux::View, public unity::debug::Introspectable
   void ActivateNext();
   void ActivatePrevious();
 
+  std::string GetActiveScopeId() const;
+
   sigc::signal<void, std::string const&> scope_activated;
 
 private:

dash/ScopeView.cpp

@@ -256,11 +256,6 @@ void ScopeView::SetupViews(nux::Area* show_filters)
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);
 
-  scroll_view_->geometry_changed.connect([this] (nux::Area *area, nux::Geometry& geo)
-  {
-    CheckScrollBarState();
-  });
-
   scroll_layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
   scroll_view_->SetLayout(scroll_layout_);
   scroll_view_->SetRightArea(show_filters);
@@ -827,13 +822,13 @@ void ScopeView::OnGroupExpanded(PlacesGroup* group)
 
 void ScopeView::CheckScrollBarState()
 {
-  if (scroll_layout_->GetGeometry().height > scroll_view_->GetGeometry().height)
+  if (scroll_layout_->GetHeight() > scroll_view_->GetHeight())
   {
-    scroll_view_->EnableVerticalScrollBar(true); 
+    scroll_view_->EnableVerticalScrollBar(true);
   }
   else
   {
-    scroll_view_->EnableVerticalScrollBar(false); 
+    scroll_view_->EnableVerticalScrollBar(false);
   }
 }
 
@@ -880,6 +875,7 @@ void ScopeView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_dra
 {
   nux::Geometry const& geo(GetGeometry());
   graphics_engine.PushClippingRectangle(geo);
+  CheckScrollBarState();
 
   if (!IsFullRedraw() && RedirectedAncestor())
   {

debian/changelog

@@ -9,6 +9,67 @@ unity (7.0.0daily13.04.10ubuntu.unity.experimental.certified-0ubuntu1) raring; u
 
  -- Ubuntu daily release <[email protected]>  Wed, 10 Apr 2013 07:16:02 +0000
 
+unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low
+
+  [ Brandon Schaefer ]
+  * Command lens does not close when pressing Alt+F2 (LP: #1167466)
+
+  [ Andrea Azzarone ]
+  * dash preview animation is slow on high resolution screens (also
+    fullscreen mode) (LP: #1055126)
+
+  [ Marco Trevisan (Treviño) ]
+  * Unity makes unneeded copies of Nux DrawList (LP: #1167605)
+  * Unityshell uses much of his CPU time only to get tray XIDs from
+    PanelController (LP: #1167894)
+  * Adding Lens results is more expensive than needed (LP: #1168569)
+  * Opening new-window from quicklist static action does not focus the
+    newly opened window (LP: #1164483)
+  * Launcher pre-processes icons also when the icons have not been
+    changed since last draw cycle (LP: #1168556)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3300
+
+ -- Ubuntu daily release <[email protected]>  Mon, 15 Apr 2013 04:17:42 +0000
+
+unity (7.0.0daily13.04.10-0ubuntu1) raring; urgency=low
+
+  [ Andrea Azzarone ]
+  * Launcher icons automatically placed in the launcher by USC (or apps
+    lens) fail to have running 'pips'. (LP: #1165097)
+
+  [ Marco Trevisan (Treviño) ]
+  * Unity wastes some memory by allocating multiple times the same
+    texture (LP: #1166532)
+  * Unity is creating multiple instances of DBusIndicators per each
+    monitor (LP: #1166550)
+
+  [ Michi Henning ]
+  * ResultIterator.h defines functions that return const values (LP:
+    #1163705)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3290
+
+ -- Ubuntu daily release <[email protected]>  Wed, 10 Apr 2013 04:03:19 +0000
+
+unity (7.0.0daily13.04.08-0ubuntu1) raring; urgency=low
+
+  [ Tigran Gabrielyan ]
+  * [UIFe] Window list in right click context menu should indicate the
+    focused window (LP: #1152477)
+
+  [ Andrea Azzarone ]
+  * Launcher - When a app is automatically placed in the Launcher after
+    being installed from the Software Center, it should be in the 'non-
+    running' state (LP: #987727)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3283
+
+ -- Ubuntu daily release <[email protected]>  Mon, 08 Apr 2013 04:02:51 +0000
+
 unity (7.0.0daily13.04.05.2-0ubuntu1) raring; urgency=low
 
   * Revert r3266 "Don't close the dash when switching from the command lens 

debian/control

@@ -28,7 +28,7 @@ Build-Depends: cmake,
                libunity-misc-dev (>= 4.0.4),
                libgrail-dev (>= 1.0.20),
                libxcb-icccm4-dev,
-               libnux-4.0-dev (>= 4.0.0daily13.01.18bzr752),
+               libnux-4.0-dev (>= 4.0.1),
                compiz-dev (>= 1:0.9.9~daily13.01.25bzr3586),
                libcompizconfig0-dev (>= 1:0.9.9~daily12.12.05-0ubuntu2),
                xsltproc,