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

[Andrea Azzarone]

Fix UnityViewWindow background when blur is disabled.

== Problem ==
When blur is disabled, shortcuts overlay and alt+tab switcher is completely transparent.

== Fix ==
Fix UnityWindowView::DrawContent.

== Test ==
Manual test added.

[Alex Launi (alexlauni)]

If I understand this correctly you should be able to AP test this by putting the blur geometry into introspection and testing the values.

review: Needs Fixing (quality)

[Andrea Azzarone (azzar1)]

> If I understand this correctly you should be able to AP test this by putting
> the blur geometry into introspection and testing the values.

AP test added.

[Alex Launi (alexlauni)]

AP test looks good to me.

review: Approve (quality)

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2012-05-07 22:28:17 +0000
+++ launcher/SwitcherView.h	2012-05-17 12:17:34 +0000
@@ -27,8 +27,6 @@
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/UnityWindowView.h"
 
-#include "unity-shared/Introspectable.h"
-
 #include <boost/shared_ptr.hpp>
 #include <sigc++/sigc++.h>
 
@@ -48,7 +46,7 @@
 namespace switcher
 {
 
-class SwitcherView : public debug::Introspectable, public ui::UnityWindowView
+class SwitcherView : public ui::UnityWindowView
 {
   NUX_DECLARE_OBJECT_TYPE(SwitcherView, ui::UnityWindowView);
 public:

=== modified file 'manual-tests/ShortcutsOverlay.txt'
--- manual-tests/ShortcutsOverlay.txt	2012-04-10 22:23:44 +0000
+++ manual-tests/ShortcutsOverlay.txt	2012-05-17 12:17:34 +0000
@@ -12,3 +12,4 @@
 
 Outcome:
   The keyboard shortcuts overlay bottom is not truncated.
+

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutController.cpp	2012-05-17 12:17:34 +0000
@@ -157,6 +157,7 @@
 void Controller::ConstructView()
 {
   view_ = View::Ptr(new View());
+  AddChild(view_.GetPointer());
   view_->SetModel(model_);
   view_->background_color = bg_color_;
 

=== modified file 'shortcuts/ShortcutView.cpp'
--- shortcuts/ShortcutView.cpp	2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutView.cpp	2012-05-17 12:17:34 +0000
@@ -287,5 +287,13 @@
   }
 }
 
+//
+// Introspectable methods
+//
+std::string View::GetName() const
+{
+  return "ShortcutView";
+}
+
 } // namespace shortcut
 } // namespace unity

=== modified file 'shortcuts/ShortcutView.h'
--- shortcuts/ShortcutView.h	2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutView.h	2012-05-17 12:17:34 +0000
@@ -58,6 +58,9 @@
   void DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry clip);
   nux::Geometry GetBackgroundGeometry();
 
+  // Introspectable methods
+  std::string GetName() const;
+
 private:
   // Private methods
   nux::LinearLayout* CreateSectionLayout(const char* section_name);

=== modified file 'tests/autopilot/unity/emulators/shortcut_hint.py'
--- tests/autopilot/unity/emulators/shortcut_hint.py	2012-05-16 04:13:24 +0000
+++ tests/autopilot/unity/emulators/shortcut_hint.py	2012-05-17 12:17:34 +0000
@@ -17,10 +17,16 @@
 
 logger = logging.getLogger(__name__)
 
+class ShortcutView(UnityIntrospectionObject):
+    """Proxy object for the shortcut view child of the controller."""
 
 class ShortcutController(UnityIntrospectionObject, KeybindingsHelper):
     """ShortcutController proxy class."""
 
+    def get_shortcut_view(self):
+        views = self.get_children_by_type(ShortcutView)
+        return views[0] if views else None
+
     def show(self):
         """Push the keys necessary to reveal the shortcut hint, but don't block."""
         logger.debug("Revealing shortcut hint with keyboard.")

=== modified file 'tests/autopilot/unity/tests/test_shortcut_hint.py'
--- tests/autopilot/unity/tests/test_shortcut_hint.py	2012-05-08 16:13:17 +0000
+++ tests/autopilot/unity/tests/test_shortcut_hint.py	2012-05-17 12:17:34 +0000
@@ -86,6 +86,12 @@
         self.shortcut_hint.cancel()
         self.assertThat(self.shortcut_hint.visible, Eventually(Equals(False)))
 
+    def test_shortcut_hint_no_blur(self):
+        """"""
+        self.shortcut_hint.ensure_visible()
+        self.addCleanup(self.shortcut_hint.ensure_hidden)
+
+        self.assertThat(self.shortcut_hint.get_shortcut_view().bg_texture_is_valid, Eventually(Equals(True)))
 
 class ShortcutHintInteractionsTests(BaseShortcutHintTests):
     """Test the shortcuthint interactions with other Unity parts."""

=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2012-05-07 22:28:17 +0000
+++ unity-shared/UnityWindowView.cpp	2012-05-17 12:17:34 +0000
@@ -17,6 +17,8 @@
  * Authored by: Jason Smith <[e-mail]>
  */
 
+#include <UnityCore/Variant.h>
+
 #include "UnityWindowView.h"
 
 namespace unity {
@@ -56,7 +58,7 @@
   // clear region
   gPainter.PaintBackground(GfxContext, base);
 
-  nux::Geometry background_geo = GetBackgroundGeometry();
+  nux::Geometry background_geo(GetBackgroundGeometry());
   int internal_offset = style()->GetInternalOffset();
 
   nux::Geometry internal_clip(background_geo.x + internal_offset,
@@ -65,50 +67,54 @@
                               background_geo.height - internal_offset * 2);
   GfxContext.PushClippingRectangle(internal_clip);
 
-  nux::Geometry geo_absolute = GetAbsoluteGeometry ();
+  nux::Geometry const& geo_absolute = GetAbsoluteGeometry();
+  nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
 
   if (BackgroundEffectHelper::blur_type != BLUR_NONE)
   {
-    nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
-    auto blur_texture = bg_helper_.GetBlurRegion(blur_geo);
-
-    if (blur_texture.IsValid())
-    {
-      nux::TexCoordXForm texxform_blur_bg;
-      texxform_blur_bg.flip_v_coord = true;
-      texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-      texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
-      texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
-
-      nux::ROPConfig rop;
-      rop.Blend = false;
-      rop.SrcBlend = GL_ONE;
-      rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+    bg_texture_ = bg_helper_.GetBlurRegion(blur_geo);
+  }
+  else
+  {
+    bg_texture_ = bg_helper_.GetRegion(blur_geo);
+  }
+
+  if (bg_texture_.IsValid())
+  {
+    nux::TexCoordXForm texxform_blur_bg;
+    texxform_blur_bg.flip_v_coord = true;
+    texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+    texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
+    texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
+
+    nux::ROPConfig rop;
+    rop.Blend = false;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
 #ifndef NUX_OPENGLES_20
-      if (GfxContext.UsingGLSLCodePath())
-        gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                          blur_texture,
-                                          texxform_blur_bg,
-                                          nux::color::White,
-                                          background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                          true, rop);
-      else
-        gPainter.PushDrawTextureLayer(GfxContext, base,
-                                      blur_texture,
-                                      texxform_blur_bg,
-                                      nux::color::White,
-                                      true,
-                                      rop);
+    if (GfxContext.UsingGLSLCodePath())
+      gPainter.PushDrawCompositionLayer(GfxContext, base,
+                                        bg_texture_,
+                                        texxform_blur_bg,
+                                        nux::color::White,
+                                        background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+                                        true, rop);
+    else
+      gPainter.PushDrawTextureLayer(GfxContext, base,
+                                    bg_texture_,
+                                    texxform_blur_bg,
+                                    nux::color::White,
+                                    true,
+                                    rop);
 #else
-        gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                          blur_texture,
-                                          texxform_blur_bg,
-                                          nux::color::White,
-                                          background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                          true, rop);
+      gPainter.PushDrawCompositionLayer(GfxContext, base,
+                                        bg_texture_,
+                                        texxform_blur_bg,
+                                        nux::color::White,
+                                        background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+                                        true, rop);
 #endif
-    }
   }
 
   nux::ROPConfig rop;
@@ -240,6 +246,18 @@
   GfxContext.GetRenderStates().SetBlend (FALSE);
 }
 
+// Introspectable methods
+std::string UnityWindowView::GetName() const
+{
+  return "UnityWindowView";
+}
+
+void UnityWindowView::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper(builder)
+    .add("bg-texture-is-valid", bg_texture_.IsValid());
+}
+
 
 }
 }

=== modified file 'unity-shared/UnityWindowView.h'
--- unity-shared/UnityWindowView.h	2012-05-07 22:28:17 +0000
+++ unity-shared/UnityWindowView.h	2012-05-17 12:17:34 +0000
@@ -21,6 +21,7 @@
 #define UNITYWINDOWVIEW_H
 
 #include "unity-shared/BackgroundEffectHelper.h"
+#include "Introspectable.h"
 #include "UnityWindowStyle.h"
 #include <sigc++/sigc++.h>
 
@@ -32,7 +33,7 @@
 namespace unity {
 namespace ui {
 
-class UnityWindowView : public nux::View
+class UnityWindowView : public debug::Introspectable, public nux::View
 {
   NUX_DECLARE_OBJECT_TYPE(UnityWindowView, nux::View)  
 public:
@@ -53,10 +54,15 @@
   virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw) {};
   virtual nux::Geometry GetBackgroundGeometry() = 0;
 
+  // Introspectable methods
+  std::string GetName() const;
+  void AddProperties(GVariantBuilder* builder);
+
 private:
   void DrawBackground(nux::GraphicsEngine& GfxContext, nux::Geometry const& geo);
 
   BackgroundEffectHelper bg_helper_;
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> bg_texture_;
 };
 
 }