Merge lp:~thjaeger/unity/raise-maximized into lp:unity

[Tom Jaeger]

Fix for bug #731761 (clicking on top panel should raise maximized windows):

https://bugs.launchpad.net/unity/+bug/731761

[Jason Smith (jassmith)]

You are probably looking to call window->raise () rather than updateAttributes

review: Needs Fixing

[Tom Jaeger (thjaeger)]

No, this is intentional. If you look at the compiz event handler or the
move plugin, they both call updateAttributes rather than raise. I don't
fully understand why, but unity should do the same in any case.

On Fri, Mar 18, 2011 at 11:35 AM, Jason Smith <email address hidden> wrote:

> Review: Needs Fixing
> You are probably looking to call window->raise () rather than
> updateAttributes
> --
> https://code.launchpad.net/~thjaeger/unity/raise-maximized/+merge/52644<https://code.launchpad.net/%7Ethjaeger/unity/raise-maximized/+merge/52644>
> You are the owner of lp:~thjaeger/unity/raise-maximized.
>

[Jason Smith (jassmith)]

review: Approve

[Neil J. Patel (njpatel)]

review: Approve

[Neil J. Patel (njpatel)]

Hi Tom, it seems that something like this is already in Unity. On the bug, Bilal indicates it could have landed through a branch by Dylan McCall. Could you please test to see if Unity has gained this feature and if this branch is no longer necessary? It seems to work for me in trunk, but I'm not sure if I'm missing something. Thanks!

[Alex Launi (alexlauni)]

Yeah, this was previously implemented.

Unmerged revisions

932. By Tom Jaeger on 2011-03-09

Raise maximized window when clicking on the top panel (LP: #731761)

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-07 10:59:31 +0000
+++ src/PanelMenuView.cpp	2011-03-09 07:04:10 +0000
@@ -822,6 +822,7 @@
       _is_grabbed = true;
       Refresh ();
       FullRedraw ();
+      WindowManager::Default ()->Raise (bamf_window_get_xid (window));
       WindowManager::Default ()->StartMove (bamf_window_get_xid (window), x, y);
     }
   }

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-02-10 21:06:26 +0000
+++ src/PluginAdapter.cpp	2011-03-09 07:04:10 +0000
@@ -362,6 +362,17 @@
     window->lower ();
 }
 
+void
+PluginAdapter::Raise (guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow *window;
+
+  window = m_Screen->findWindow (win);
+  if (window)
+    window->updateAttributes (CompStackingUpdateModeAboveFullscreen);
+}
+
 void PluginAdapter::MaximizeIfBigEnough (CompWindow *window)
 {
   XClassHint   classHint;

=== modified file 'src/PluginAdapter.h'
--- src/PluginAdapter.h	2011-02-10 21:06:26 +0000
+++ src/PluginAdapter.h	2011-03-09 07:04:10 +0000
@@ -82,6 +82,7 @@
     void Minimize (guint32 xid);
     void Close (guint32 xid);
     void Lower (guint32 xid);
+    void Raise (guint32 xid);
 
     void MaximizeIfBigEnough (CompWindow *window);
     

=== modified file 'src/WindowManager.cpp'
--- src/WindowManager.cpp	2011-02-25 20:34:43 +0000
+++ src/WindowManager.cpp	2011-03-09 07:04:10 +0000
@@ -67,6 +67,11 @@
   {
     g_debug ("%s", G_STRFUNC);
   }
+  
+ void Raise (guint32 xid)
+  {
+    g_debug ("%s", G_STRFUNC);
+  }
 };
 
 WindowManager *

=== modified file 'src/WindowManager.h'
--- src/WindowManager.h	2011-02-09 14:28:54 +0000
+++ src/WindowManager.h	2011-03-09 07:04:10 +0000
@@ -55,6 +55,7 @@
   virtual void Close (guint32 xid) = 0;
   
   virtual void Lower (guint32 xid) = 0;
+  virtual void Raise (guint32 xid) = 0;
 
   virtual void Decorate   (guint32 xid);
   virtual void Undecorate (guint32 xid);