Merge lp:~cando/unity/fix_dodge_active_window into lp:unity

[Stefano Candori]

In this branch i've fixed bug #718185.

[Omer Akram (om26er)]

I have build unity with this branch, the launcher does not show when a model dialog is shown *but* when that dialog is closed the launcher comes for a second and then hides.

review: Needs Fixing (functional)

[Stefano Candori (cando)]

Uh! It doesn't happen here...any step to reproduce???It happens with every
dialog??
By the way, i'm looking into that.

2011/2/20 Omer Akram <email address hidden>

> Review: Needs Fixing functional
> I have build unity with this branch, the launcher does not show when a
> model dialog is shown *but* when that dialog is closed the launcher comes
> for a second and then hides.
> --
>
> https://code.launchpad.net/~cando/unity/fix_dodge_active_window/+merge/50509
> You are the owner of lp:~cando/unity/fix_dodge_active_window.
>

[Omer Akram (om26er)]

It happens with every window it seems. modal or not. if I have two maximized windows, closing the upper(with the close button) will show the launcher for a second and then hide it while giving the focus to the lower window.

Also the launcher is hiding when on desktop too.

[Stefano Candori (cando)]

Ok, got it thanks. Btw this is another bug that it's strictly related to
this one. Also the desktop problem is due to another bug (a windows focus
one): if you click on the desktop (and so the desktop window becomes active)
the launcher should be shown.
I'm on these bugs right now.

2011/2/20 Omer Akram <email address hidden>

> It happens with every window it seems. modal or not. if I have two
> maximized windows, closing the upper(with the close button) will show the
> launcher for a second and then hide it while giving the focus to the lower
> window.
>
> Also the launcher is hiding when on desktop too.
> --
>
> https://code.launchpad.net/~cando/unity/fix_dodge_active_window/+merge/50509
> You are the owner of lp:~cando/unity/fix_dodge_active_window.
>

[lp:~cando/unity/fix_dodge_active_window]

875. By Stefano Candori on 2011-02-20

Modal or dialog windows should behave as their parents (if any).

[Stefano Candori (cando)]

Omar, i can reproduce it *almost* never....weird.
Let's wait for what the Unity team says.

[Neil J. Patel (njpatel)]

Stefano, the panel's window might be getting focus before the maximised window beneath it, and hence the launcher pops out. I think it's worth checking in the launcher, before it pops out, if the active window is one of the internal unity windows, and then ignoring if that is the case.

You can get the list of internal unity windows with: nux::XInputWindow::NativeHandleList () (which is a static function that gives you a std::list<Window>.

Hope that helps!

[Stefano Candori (cando)]

Neil, thanks very much...i'll look into that asap!

2011/2/23 Neil J. Patel <email address hidden>

> Stefano, the panel's window might be getting focus before the maximised
> window beneath it, and hence the launcher pops out. I think it's worth
> checking in the launcher, before it pops out, if the active window is one of
> the internal unity windows, and then ignoring if that is the case.
>
> You can get the list of internal unity windows with:
> nux::XInputWindow::NativeHandleList () (which is a static function that
> gives you a std::list<Window>.
>
> Hope that helps!
> --
>
> https://code.launchpad.net/~cando/unity/fix_dodge_active_window/+merge/50509
> You are the owner of lp:~cando/unity/fix_dodge_active_window.
>

[Omer Akram (om26er)]

The bug linked to this branch is fixed with another commit

review: Disapprove

Unmerged revisions

875. By Stefano Candori on 2011-02-20

Modal or dialog windows should behave as their parents (if any).

874. By Stefano Candori on 2011-02-20

Fix LP:#718185 .

Don't show the launcher when a modal dialog is opened.
Let's also show the launcher when the active window is the desktop.

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-02-18 20:54:27 +0000
+++ src/Launcher.cpp	2011-02-20 17:15:12 +0000
@@ -1302,9 +1302,30 @@
   nux::Geometry geo = GetGeometry ();
   int intersect_types = CompWindowTypeNormalMask | CompWindowTypeDialogMask |
                         CompWindowTypeModalDialogMask | CompWindowTypeUtilMask;
-
-  if (!window || !(window->type () & intersect_types) || !window->isMapped () || !window->isViewable ())
-    return false;
+                      
+  if (!window || !window->isMapped () || !window->isViewable ()) 
+    return false;  
+    
+  if (_hidemode == LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW)
+  {
+    //let's show the launcher when the active window is the Desktop
+    if (window->type () & CompWindowTypeDesktopMask)
+      return false;
+      
+    if (!(window->type () & CompWindowTypeNormalMask))
+    { 
+      if (CompRegion (window->inputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
+        return true;
+      //if our parent doesn't intersect, we do the same.
+      window = _screen->findWindow (window->transientFor ());
+      return CheckIntersectWindow (window);
+    }
+  }
+  else
+  {
+    if (!(window->type () & intersect_types))
+      return false;
+  }
 
   if (CompRegion (window->inputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
     return true;