diff options
Diffstat (limited to 'src/core/display.c')
| -rw-r--r-- | src/core/display.c | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/src/core/display.c b/src/core/display.c index 9e0d8d60..ce903273 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1717,6 +1717,42 @@ handle_window_focus_event (MetaDisplay *display, } } +static gboolean +dock_has_overlaps (MetaWindow *dock, + GList *windows) +{ + MetaRectangle dock_rect; + GList *tmp; + + if (dock->type != META_WINDOW_DOCK) + return FALSE; + + meta_window_get_input_rect (dock, &dock_rect); + + tmp = windows; + while (tmp != NULL) + { + MetaWindow *other; + MetaRectangle other_rect; + + other = tmp->data; + tmp = tmp->next; + + if (dock == other) + continue; + + if (dock->layer != other->layer) + continue; + + meta_window_get_input_rect (other, &other_rect); + + if (meta_rectangle_overlap (&dock_rect, &other_rect)) + return TRUE; + } + + return FALSE; +} + static Bool unmap_predicate (Display *display, XEvent *event, @@ -2205,7 +2241,8 @@ event_callback (XEvent *event, break; } - if (window->type == META_WINDOW_DOCK) + if (window->type == META_WINDOW_DOCK && + dock_has_overlaps (window, screen->stack->sorted)) meta_window_raise (window); } break; @@ -2216,6 +2253,7 @@ event_callback (XEvent *event, else if (window != NULL) { if (window->type == META_WINDOW_DOCK && + dock_has_overlaps (window, screen->stack->sorted) && event->xcrossing.mode != NotifyGrab && event->xcrossing.mode != NotifyUngrab && !window->has_focus) |