Merge lp:~3v1n0/unity/damage-dash into lp:unity

[Marco Trevisan (Treviño)]

UnityShell: redraw the dash also if a non-blurred area is damaged

If the dash is damaged, but not the blurred area, it won't redraw. We need
to draw it, in order to avoid flickering of its border.

Also, add the redraw_view_if_damaged utility function to redraw a view if
really needed.

Make sure we always redraw the dash if it's damaged (outside the blurred area),
optimize the code for repeatly doing it for all the views.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/273/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/229
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/229/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3509
http://jenkins.qa.ubuntu.com/job/unity-ci/362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/250

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/283/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/239
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/239/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/239

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/289/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/245
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/245/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/290/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/246
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/246/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-07-01 21:19:33 +0000
+++ dash/DashController.cpp	2013-09-16 17:51:35 +0000
@@ -67,7 +67,6 @@
   , monitor_(0)
   , visible_(false)
   , need_show_(false)
-  , view_(nullptr)
   , ensure_timeout_(PRELOAD_TIMEOUT_LENGTH)
   , timeline_animator_(90)
 {
@@ -142,10 +141,10 @@
 void Controller::SetupDashView()
 {
   view_ = new DashView(std::make_shared<GSettingsScopes>(), std::make_shared<ApplicationStarterImp>());
-  AddChild(view_);
+  AddChild(view_.GetPointer());
 
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout->AddView(view_, 1);
+  layout->AddView(view_.GetPointer(), 1);
   layout->SetContentDistribution(nux::MAJOR_POSITION_START);
   layout->SetVerticalExternalMargin(0);
   layout->SetHorizontalExternalMargin(0);
@@ -477,6 +476,11 @@
   return geo;
 }
 
+nux::ObjectPtr<DashView> const& Controller::Dash() const
+{
+  return view_;
+}
+
 
 }
 }

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2013-07-01 21:19:33 +0000
+++ dash/DashController.h	2013-09-16 17:51:35 +0000
@@ -68,6 +68,7 @@
   bool IsVisible() const;
   bool IsCommandLensOpen() const;
   nux::Geometry GetInputWindowGeometry();
+  nux::ObjectPtr<DashView> const& Dash() const;
 
 protected:
   std::string GetName() const;
@@ -99,11 +100,11 @@
 private:
   WindowCreator create_window_;
   nux::ObjectPtr<ResizingBaseWindow> window_;
+  nux::ObjectPtr<DashView> view_;
   int monitor_;
 
   bool visible_;
   bool need_show_;
-  DashView* view_;
 
   connection::Wrapper screen_ungrabbed_slot_;
   glib::DBusServer dbus_server_;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-09-12 03:12:04 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-09-16 17:51:35 +0000
@@ -1334,26 +1334,39 @@
   if (animation_controller_->HasRunningAnimations())
     nuxDamageCompiz();
 
-  std::list <ShowdesktopHandlerWindowInterface *> remove_windows;
-
-  for (ShowdesktopHandlerWindowInterface *wi : ShowdesktopHandler::animating_windows)
+  for (auto it = ShowdesktopHandler::animating_windows.begin(); it != ShowdesktopHandler::animating_windows.end();)
   {
-    ShowdesktopHandlerWindowInterface::PostPaintAction action = wi->HandleAnimations (0);
+    auto const& wi = *it;
+    auto action = wi->HandleAnimations(0);
+
     if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
-      remove_windows.push_back(wi);
+    {
+      it = ShowdesktopHandler::animating_windows.erase(it);
+      continue;
+    }
     else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
+    {
       wi->AddDamage ();
-  }
+    }
 
-  for (ShowdesktopHandlerWindowInterface *wi : remove_windows)
-  {
-    wi->DeleteHandler ();
-    ShowdesktopHandler::animating_windows.remove (wi);
+    ++it;
   }
 
   cScreen->donePaint ();
 }
 
+void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)
+{
+  if (!view || view->IsRedrawNeeded())
+    return;
+
+  auto const& geo = view->GetAbsoluteGeometry();
+  CompRegion region(geo.x, geo.y, geo.width, geo.height);
+
+  if (damage.intersects(region))
+    view->NeedSoftRedraw();
+}
+
 void UnityScreen::compizDamageNux(CompRegion const& damage)
 {
   if (!launcher_controller_)
@@ -1378,79 +1391,28 @@
     }
   }
 
+  if (dash_controller_->IsVisible())
+    redraw_view_if_damaged(dash_controller_->Dash(), damage);
+
   auto const& launchers = launcher_controller_->launchers();
   for (auto const& launcher : launchers)
   {
     if (!launcher->Hidden())
     {
-      nux::Geometry const& geo = launcher->GetAbsoluteGeometry();
-      CompRegion launcher_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(launcher_region))
-        launcher->QueueDraw();
-
-      nux::ObjectPtr<nux::View> const& tooltip = launcher->GetActiveTooltip();
-
-      if (tooltip)
-      {
-        nux::Geometry const& g = tooltip->GetAbsoluteGeometry();
-        CompRegion tip_region(g.x, g.y, g.width, g.height);
-
-        if (damage.intersects(tip_region))
-          tooltip->QueueDraw();
-      }
-
-      nux::ObjectPtr<LauncherDragWindow> const& dragged_icon = launcher->GetDraggedIcon();
-
-      if (dragged_icon)
-      {
-        nux::Geometry const& g = dragged_icon->GetAbsoluteGeometry();
-        CompRegion icon_region(g.x, g.y, g.width, g.height);
-
-        if (damage.intersects(icon_region))
-          dragged_icon->QueueDraw();
-      }
+      redraw_view_if_damaged(launcher, damage);
+      redraw_view_if_damaged(launcher->GetActiveTooltip(), damage);
+      redraw_view_if_damaged(launcher->GetDraggedIcon(), damage);
     }
   }
 
   for (auto const& panel : panel_controller_->panels())
-  {
-    nux::Geometry const& geo = panel->GetAbsoluteGeometry();
-
-    CompRegion panel_region(geo.x, geo.y, geo.width, geo.height);
-
-    if (damage.intersects(panel_region))
-      panel->QueueDraw();
-  }
-
-  QuicklistManager* qm = QuicklistManager::Default();
-  if (qm)
-  {
-    auto const& view = qm->Current();
-
-    if (view)
-    {
-      nux::Geometry const& geo = view->GetAbsoluteGeometry();
-      CompRegion quicklist_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(quicklist_region))
-        view->QueueDraw();
-    }
-  }
-
-  if (switcher_controller_ && switcher_controller_->Visible())
-  {
-    auto const& view = switcher_controller_->GetView();
-
-    if (G_LIKELY(view))
-    {
-      nux::Geometry const& geo = view->GetAbsoluteGeometry();
-      CompRegion switcher_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(switcher_region))
-        view->QueueDraw();
-    }
-  }
+    redraw_view_if_damaged(panel, damage);
+
+  if (QuicklistManager* qm = QuicklistManager::Default())
+    redraw_view_if_damaged(qm->Current(), damage);
+
+  if (switcher_controller_->Visible())
+    redraw_view_if_damaged(switcher_controller_->GetView(), damage);
 }
 
 /* Grab changed nux regions and add damage rects for them */