Merge lp:~njpatel/unity/fix-panel-opacity into lp:unity

[Neil J. Patel]

Fixes the panel opacity to work better with the blending modes we now use (do the opacity at paint time). Also adds a nicety so that we don't paint a shadow/blur if the opacity is 0.0f (which most people are using for an uber-clean look).

The drawing code needs to be cleaned up to not be as crazy, but this branch wasn't meant to do that so will leave it until after release.

[Andrea Cimitan (cimi)]

Seems correctly done to me

review: Approve

=== modified file 'plugins/unityshell/src/PanelController.cpp'
--- plugins/unityshell/src/PanelController.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/PanelController.cpp	2011-09-07 21:07:07 +0000
@@ -187,7 +187,7 @@
       window->SinkReference();
       window->SetConfigureNotifyCallback(&PanelController::WindowConfigureCallback, window);
       window->SetLayout(layout);
-      window->SetBackgroundColor(nux::Color(0x00000000));
+      window->SetBackgroundColor(nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
       window->ShowWindow(true);
       window->EnableInputWindow(true, "panel", false, false);
       window->InputWindowEnableStruts(true);
@@ -230,6 +230,11 @@
   geo = window->GetGeometry();
 }
 
+float PanelController::opacity() const
+{
+  return _opacity;
+}
+
 const gchar*
 PanelController::GetName()
 {

=== modified file 'plugins/unityshell/src/PanelController.h'
--- plugins/unityshell/src/PanelController.h	2011-09-01 14:24:46 +0000
+++ plugins/unityshell/src/PanelController.h	2011-09-07 21:07:07 +0000
@@ -39,6 +39,8 @@
 
   unsigned int GetTrayXid ();
 
+  float opacity() const;
+
 protected:
   const gchar* GetName();
   void          AddProperties(GVariantBuilder* builder);

=== modified file 'plugins/unityshell/src/PanelStyle.cpp'
--- plugins/unityshell/src/PanelStyle.cpp	2011-09-07 12:59:27 +0000
+++ plugins/unityshell/src/PanelStyle.cpp	2011-09-07 21:07:07 +0000
@@ -131,12 +131,16 @@
   self->Refresh();
 }
 
-nux::NBitmapData* PanelStyle::GetBackground(int width, int height)
+nux::NBitmapData* PanelStyle::GetBackground(int width, int height, float opacity)
 {
   // TODO: check to see if we can put this on the stack.
   nux::CairoGraphics* context = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
   // Use the internal context as we know it is good and shiny new.
-  gtk_render_background(_style_context, context->GetInternalContext(), 0, 0, width, height);
+  cairo_t* cr = context->GetInternalContext();
+  cairo_push_group(cr);
+  gtk_render_background(_style_context, cr, 0, 0, width, height);
+  cairo_pop_group_to_source(cr);
+  cairo_paint_with_alpha(cr, opacity);
 
   nux::NBitmapData* bitmap = context->GetBitmap();
 

=== modified file 'plugins/unityshell/src/PanelStyle.h'
--- plugins/unityshell/src/PanelStyle.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PanelStyle.h	2011-09-07 21:07:07 +0000
@@ -50,7 +50,7 @@
 
   GtkStyleContext* GetStyleContext();
 
-  nux::NBitmapData* GetBackground(int width, int height);
+  nux::NBitmapData* GetBackground(int width, int height, float opacity);
 
   nux::BaseTexture* GetWindowButton(WindowButtonType type, WindowState state);
 

=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-09-02 16:13:19 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-09-07 21:07:07 +0000
@@ -189,7 +189,7 @@
 
   GfxContext.PushClippingRectangle(GetGeometry());
 
-  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, geo.width, geo.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
@@ -243,7 +243,7 @@
   GfxContext.GetRenderStates().SetBlend(true);
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry geo_absolute = GetAbsoluteGeometry ();
     nux::TexCoordXForm texxform_blur_bg;
@@ -312,7 +312,7 @@
   }
   else
   {
-    nux::NBitmapData* bitmap = _style->GetBackground(geo.width, geo.height);
+    nux::NBitmapData* bitmap = _style->GetBackground(geo.width, geo.height, _opacity);
     nux::BaseTexture* texture2D = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
     texture2D->Update(bitmap);
     delete bitmap;
@@ -328,7 +328,6 @@
     rop.SrcBlend = GL_ONE;
     rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
     nux::Color col = nux::color::White;
-    col.alpha = _opacity;
 
     _bg_layer = new nux::TextureLayer(texture2D->GetDeviceTexture(),
                                       texxform,

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-06 15:06:49 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-07 21:07:07 +0000
@@ -411,7 +411,7 @@
   vc[2] = y1;
   vc[3] = y2;
 
-  if (!dash_is_open_)
+  if (!dash_is_open_ && panelController->opacity())
   {
     foreach(GLTexture * tex, _shadow_texture)
     {

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-07-29 07:15:54 +0000
+++ services/panel-service.c	2011-09-07 21:07:07 +0000
@@ -503,7 +503,7 @@
                                     PanelService         *self)
 {
   gchar *entry_id;
-  
+
   g_return_if_fail (PANEL_IS_SERVICE (self));
   if (entry == NULL)
     {
@@ -512,7 +512,7 @@
     }
 
   entry_id = g_strdup_printf ("%p", entry);
-
+  
   g_signal_emit (self, _service_signals[ENTRY_SHOW_NOW_CHANGED], 0, entry_id, show_now_changed);
 
   g_free (entry_id);