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

[Andrea Azzarone]

Re-add code to draw panel background texture when the dash is open and there is a maximized window.

== Problem ==
Regression, bug 839480 - panel background when app is maximized

== Fix ==
Re-add the code to draw panel background behind dash when app is maximized.

== Test ==
Visual change. Not applicable.

[Brandon Schaefer (brandontschaefer)]

Confirmed working, looks a lot better :)

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/unityshell.h

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-07 11:05:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-07 12:42:23 +0000
@@ -647,24 +647,28 @@
 {
   CompOutput *output = _last_output;
 
+  DrawTopPanelBackground();
+
+  auto gpu_device = nux::GetGraphicsDisplay()->GetGpuDevice();
+
   nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
-    nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(gScreen->fbo ()->tex ()->name (),
-      screen->width(), screen->height(), 1, nux::BITFMT_R8G8B8A8);
-
-  nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
-
-  nux::Geometry geo = nux::Geometry (0, 0, screen->width (), screen->height ());
-  nux::Geometry oGeo = nux::Geometry (output->x (), output->y (), output->width (), output->height ());
+    gpu_device->CreateTexture2DFromID(gScreen->fbo ()->tex ()->name (),
+                                      screen->width(), screen->height(), 1, nux::BITFMT_R8G8B8A8);
+
+  gpu_device->backup_texture0_ = device_texture;
+
+  nux::Geometry geo(0, 0, screen->width (), screen->height ());
+  nux::Geometry outputGeo(output->x (), output->y (), output->width (), output->height ());
   BackgroundEffectHelper::monitor_rect_ = geo;
 
   GLint fboID;
   // Nux renders to the referenceFramebuffer when it's embedded.
   glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fboID);
-  wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, oGeo);
+  wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, outputGeo);
 
   nuxPrologue();
   _in_paint = true;
-  wt->RenderInterfaceFromForeignCmd (&oGeo);
+  wt->RenderInterfaceFromForeignCmd (&outputGeo);
   _in_paint = false;
   nuxEpilogue();
 
@@ -724,6 +728,53 @@
   didShellRepaint = true;
 }
 
+void UnityScreen::DrawTopPanelBackground()
+{
+  auto graphics_engine = nux::GetGraphicsDisplay()->GetGraphicsEngine();
+
+  if (!graphics_engine->UsingGLSLCodePath() || !launcher_controller_->IsOverlayOpen() || !paint_panel_)
+   return;
+
+  if (TopPanelBackgroundTextureNeedsUpdate())
+    UpdateTopPanelBackgroundTexture();
+
+  if (panel_texture_.IsValid())
+  {
+    graphics_engine->ResetModelViewMatrixStack();
+    graphics_engine->Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
+    graphics_engine->ResetProjectionMatrix();
+    graphics_engine->SetOrthographicProjectionMatrix(screen->width (), screen->height());
+
+    nux::TexCoordXForm texxform;
+    int panel_height = panel_style_.panel_height;
+    graphics_engine->QRP_GLSL_1Tex(0, 0, screen->width (), panel_height, panel_texture_, texxform, nux::color::White);
+  }
+}
+
+bool UnityScreen::TopPanelBackgroundTextureNeedsUpdate() const
+{
+  return panel_texture_has_changed_ || !panel_texture_.IsValid();
+}
+
+void UnityScreen::UpdateTopPanelBackgroundTexture()
+{
+  auto gpu_device = nux::GetGraphicsDisplay()->GetGpuDevice();
+  auto &panel_style = panel::Style::Instance();
+
+  panel_texture_.Release();
+
+  std::unique_ptr<nux::NBitmapData> bitmap(panel_style.GetBackground(screen->width(), screen->height(), 1.0f));
+  nux::ObjectPtr<nux::BaseTexture> texture2D(gpu_device->CreateSystemCapableTexture());
+
+  if (bitmap && texture2D)
+  {
+    texture2D->Update(bitmap.get());
+    panel_texture_ = texture2D->GetDeviceTexture();
+  }
+
+  panel_texture_has_changed_ = false;
+}
+
 bool UnityScreen::forcePaintOnTop ()
 {
     return !allowWindowPaint ||

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-07 11:05:34 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-07 12:42:23 +0000
@@ -241,6 +241,10 @@
 
   void InitGesturesSupport();
 
+  void DrawTopPanelBackground();
+  bool TopPanelBackgroundTextureNeedsUpdate() const;
+  void UpdateTopPanelBackgroundTexture();
+
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;