Merge lp:~azzar1/unity/fix-980924 into lp:unity

[Andrea Azzarone]

Fixes bug #980924.

== Problem ==
[regression] Dash keeps repainting unnecessarily

== Fix ==
Partially revert r2248 [1] without reintroducing the bottom-right bug.

[1] https://code.launchpad.net/~unity-team/unity/unity.fix-bottom-right-dash-decoration-corner

[Gord Allott (gordallott)]

UBUS_DASH_DECORATION_DAMAGED isn't used anymore with this right? we should remove the UBUS message define and the signal connect in OverlayRenderer too

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> UBUS_DASH_DECORATION_DAMAGED isn't used anymore with this right? we should
> remove the UBUS message define and the signal connect in OverlayRenderer too

Done.

[Andrea Cimitan (cimi)]

Fine for me now, waiting supergord.

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

LGTM

review: Approve

[Gord Allott (gordallott)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/668/console reported an error when processing this lp:~andyrock/unity/fix-980924 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2012-04-10 16:47:01 +0000
+++ plugins/unityshell/src/LensBar.cpp	2012-04-17 22:18:18 +0000
@@ -21,8 +21,6 @@
 
 #include "CairoTexture.h"
 #include "LensBar.h"
-#include "UBusMessages.h"
-#include "UBusWrapper.h"
 
 namespace unity
 {
@@ -75,9 +73,7 @@
   layout_->AddView(icon, 0, nux::eCenter, nux::MINOR_SIZE_FULL);
   AddChild(icon);
 
-  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
-  icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
-  icon->key_nav_focus_change.connect([&](nux::Area*, bool, nux::KeyNavDirection){ QueueDraw(); });
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
   icon->key_nav_focus_activate.connect([&, icon](nux::Area*){ SetActive(icon); });
 }
 
@@ -90,9 +86,7 @@
   layout_->AddView(icon, 0, nux::eCenter, nux::eFix);
   AddChild(icon);
 
-  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); QueueDraw(); });
-  icon->mouse_down.connect([&] (int x, int y, unsigned long button, unsigned long keyboard) {  QueueDraw(); });
-  icon->key_nav_focus_change.connect([&](nux::Area*, bool, nux::KeyNavDirection){ QueueDraw(); });
+  icon->mouse_click.connect([&, icon] (int x, int y, unsigned long button, unsigned long keyboard) { SetActive(icon); });
   icon->key_nav_focus_activate.connect([&, icon](nux::Area*){ SetActive(icon); });
 }
 
@@ -119,12 +113,6 @@
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, base, bg_layer_.get());
 
   gfx_context.PopClippingRectangle();
-
-  // trigger a redraw of the decoration, as the special masking of the
-  // decoration is usually destroyed by the clipping-rects/previous paints
-  ubus_server_send_message(ubus_server_get_default(),
-                           UBUS_DASH_DECORATION_DAMAGED,
-                           NULL);
 }
 
 void LensBar::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)

=== modified file 'plugins/unityshell/src/LensBarIcon.cpp'
--- plugins/unityshell/src/LensBarIcon.cpp	2012-04-10 16:23:46 +0000
+++ plugins/unityshell/src/LensBarIcon.cpp	2012-04-17 22:18:18 +0000
@@ -57,6 +57,7 @@
   SetAcceptKeyNavFocusOnMouseEnter(true);
 
   active.changed.connect(sigc::mem_fun(this, &LensBarIcon::OnActiveChanged));
+  key_nav_focus_change.connect([&](nux::Area*, bool, nux::KeyNavDirection){ QueueDraw(); });
 }
 
 LensBarIcon::~LensBarIcon()

=== modified file 'plugins/unityshell/src/OverlayRenderer.cpp'
--- plugins/unityshell/src/OverlayRenderer.cpp	2012-04-17 09:59:00 +0000
+++ plugins/unityshell/src/OverlayRenderer.cpp	2012-04-17 22:18:18 +0000
@@ -50,7 +50,6 @@
 
   void Init();
   void OnBackgroundColorChanged(GVariant* args);
-  void OnDashDecorationDamanged(GVariant* args);
 
   void Draw(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry);
@@ -117,9 +116,6 @@
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED,
                                  sigc::mem_fun(this, &OverlayRendererImpl::OnBackgroundColorChanged));
 
-  ubus_manager_.RegisterInterest(UBUS_DASH_DECORATION_DAMAGED,
-                                 sigc::mem_fun(this, &OverlayRendererImpl::OnDashDecorationDamanged));
-
   ubus_manager_.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
 }
 
@@ -135,11 +131,6 @@
   parent->need_redraw.emit();
 }
 
-void OverlayRendererImpl::OnDashDecorationDamanged(GVariant* args)
-{
-  parent->need_redraw.emit();
-}
-
 void OverlayRendererImpl::InitASMInverseTextureMaskShader()
 {
   nux::NString AsmVtx = 

=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2012-04-06 10:50:00 +0000
+++ plugins/unityshell/src/UBusMessages.h	2012-04-17 22:18:18 +0000
@@ -90,7 +90,4 @@
 #define UBUS_SWITCHER_SHOWN             "SWITCHER_SHOWN"
 #define UBUS_SWITCHER_SELECTION_CHANGED "SWITCHER_SELECTION_CHANGED"
 
-// Signal sent when someone thinks the decoration might got damanged by a paint
-#define UBUS_DASH_DECORATION_DAMAGED "DASH_DECORATION_DAMAGED"
-
 #endif // UBUS_MESSAGES_H