Merge lp:~smspillaz/unity/unity.fix_na_tray_expo into lp:unity

[Sam Spilsbury]

Fixes NaTray to always go on top of everything during expo so that it appears in the right place on the panel

[Jason Smith (jassmith)]

+1 looks good with fix

review: Approve

=== modified file 'plugins/unityshell/src/PanelController.cpp'
--- plugins/unityshell/src/PanelController.cpp	2011-08-24 14:56:40 +0000
+++ plugins/unityshell/src/PanelController.cpp	2011-09-02 15:28:08 +0000
@@ -52,6 +52,14 @@
   }
 }
 
+unsigned int PanelController::GetTrayXid ()
+{
+  if (!_windows.empty ())
+    return ViewForWindow (_windows.front ())->GetTrayXid ();
+  else
+    return 0;
+}
+
 void
 PanelController::StartFirstMenuShow()
 {
 
=== modified file 'plugins/unityshell/src/PanelController.h'
--- plugins/unityshell/src/PanelController.h	2011-08-24 14:56:40 +0000
+++ plugins/unityshell/src/PanelController.h	2011-09-02 15:28:08 +0000
@@ -37,6 +37,8 @@
   void SetOpacity(float opacity);
   void QueueRedraw();
 
+  unsigned int GetTrayXid ();
+
 protected:
   const gchar* GetName();
   void          AddProperties(GVariantBuilder* builder);
 
=== modified file 'plugins/unityshell/src/PanelTray.cpp'
--- plugins/unityshell/src/PanelTray.cpp	2011-08-31 08:46:29 +0000
+++ plugins/unityshell/src/PanelTray.cpp	2011-09-02 15:28:08 +0000
@@ -44,6 +44,15 @@
   RealInit();
 }
 
+unsigned int
+PanelTray::xid ()
+{
+  if (!_window)
+    return 0;
+
+  return gdk_x11_window_get_xid (gtk_widget_get_window (_window));
+}
+
 void PanelTray::RealInit()
 {
   _window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
=== modified file 'plugins/unityshell/src/PanelTray.h'
--- plugins/unityshell/src/PanelTray.h	2011-08-30 13:31:22 +0000
+++ plugins/unityshell/src/PanelTray.h	2011-09-02 15:28:08 +0000
@@ -44,9 +44,10 @@
   ~PanelTray();
 
   void Draw(nux::GraphicsEngine& gfx_content, bool force_draw);
-
   void Sync();
 
+  unsigned int xid ();
+
   virtual void OnEntryAdded(unity::indicator::Entry::Ptr const& proxy);
 
 public:
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-09-01 17:09:49 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-09-02 15:28:08 +0000
@@ -112,6 +112,14 @@
   delete _bg_layer;
 }
 
+unsigned int PanelView::GetTrayXid ()
+{
+  if (!_tray)
+    return 0;
+
+  return _tray->xid ();
+}
+
 void PanelView::OnBackgroundUpdate (GVariant *data, PanelView *self)
 {
   gdouble red, green, blue, alpha;
 
=== modified file 'plugins/unityshell/src/PanelView.h'
--- plugins/unityshell/src/PanelView.h	2011-08-24 14:56:40 +0000
+++ plugins/unityshell/src/PanelView.h	2011-09-02 15:28:08 +0000
@@ -70,6 +70,8 @@
 
   void SetOpacity(float opacity);
 
+  unsigned int GetTrayXid ();
+
 protected:
   // Introspectable methods
   const gchar* GetName();
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-01 17:18:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-02 15:28:08 +0000
@@ -114,6 +114,7 @@
   , mActiveFbo (0)
   , dash_is_open_ (false)
   , grab_index_ (0)
+  , painting_tray_ (false)
 {
   Timer timer;
   configure_logging();
@@ -460,6 +461,7 @@
 void UnityScreen::paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask)
 {
   CompOutput *output = _last_output;
+  Window     tray_xid = panelController->GetTrayXid ();
 
   mFbos[output]->unbind ();
 
@@ -478,6 +480,47 @@
   wt->RenderInterfaceFromForeignCmd (&geo);
   nuxEpilogue();
 
+  if (tray_xid && !allowWindowPaint)
+  {
+    CompWindow *tray = screen->findWindow (tray_xid);
+
+    if (tray)
+    {
+      GLMatrix oTransform;
+      UnityWindow  *uTrayWindow = UnityWindow::get (tray);
+      GLFragment::Attrib attrib (uTrayWindow->gWindow->lastPaintAttrib());
+      unsigned int oldGlAddGeometryIndex = uTrayWindow->gWindow->glAddGeometryGetCurrentIndex ();
+      unsigned int oldGlDrawIndex = uTrayWindow->gWindow->glDrawGetCurrentIndex ();
+      unsigned int oldGlDrawGeometryIndex = uTrayWindow->gWindow->glDrawGeometryGetCurrentIndex ();
+
+      attrib.setOpacity (OPAQUE);
+      attrib.setBrightness (BRIGHT);
+      attrib.setSaturation (COLOR);
+
+      oTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
+
+      glPushMatrix ();
+      glLoadMatrixf (oTransform.getMatrix ());
+
+      painting_tray_ = true;
+
+      /* force the use of the core functions */
+      uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT);
+      uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT);
+      uTrayWindow->gWindow->glDrawGeometrySetCurrentIndex (MAXSHORT);
+      uTrayWindow->gWindow->glDraw (oTransform, attrib, infiniteRegion,
+				     PAINT_WINDOW_TRANSFORMED_MASK |
+				     PAINT_WINDOW_BLEND_MASK |
+				     PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);
+      uTrayWindow->gWindow->glDrawGeometrySetCurrentIndex (oldGlDrawGeometryIndex);
+      uTrayWindow->gWindow->glAddGeometrySetCurrentIndex (oldGlAddGeometryIndex);
+      uTrayWindow->gWindow->glDrawSetCurrentIndex (oldGlDrawIndex);
+      painting_tray_ = false;
+
+      glPopMatrix ();
+    }
+  }
+
  if (switcherController->Visible ())
   {
     LayoutWindowList targets = switcherController->ExternalRenderTargets ();
@@ -1296,7 +1339,15 @@
   }
   else if (mShowdesktopHandler)
     mShowdesktopHandler->paintAttrib (wAttrib);
-  
+
+  if (uScreen->panelController->GetTrayXid () == window->id () && !allowWindowPaint)
+  {
+    if (!uScreen->painting_tray_)
+    {
+      uScreen->tray_paint_mask_ = mask;
+      mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
+    }
+  }
 
   /* Don't bother detecting occlusions if we're not doing updates
    * or we don't want to repaint the shell this pass. We also
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-09-01 17:18:02 +0000
+++ plugins/unityshell/src/unityshell.h	2011-09-02 15:28:08 +0000
@@ -311,6 +311,8 @@
   bool dash_is_open_;
   CompScreen::GrabHandle grab_index_;
   CompWindowList         fullscreen_windows_;
+  bool                   painting_tray_;
+  unsigned int           tray_paint_mask_;
 
   friend class UnityWindow;
 };