From bde3e5bd38fdc2da2f173715d2066a6dd6ac15d6 Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Mon, 10 Sep 2012 19:54:41 +0200 Subject: [PATCH] add all tooltips to top_window_group, not only the unmoved ones --- src/compositor/meta-window-actor.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index 0c23ad168..410f28b1f 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1510,7 +1510,6 @@ meta_window_actor_new (MetaWindow *window) Window top_window; MetaRectangle rectWorkArea[1]; MetaRectangle *rectWindow; - int tooltipMoved = FALSE; frame = meta_window_get_frame (window); if (frame) @@ -1550,23 +1549,14 @@ meta_window_actor_new (MetaWindow *window) // move tooltip out of top panel if necessary if (rectWindow->y < rectWorkArea->y) { meta_window_move(window, FALSE, rectWindow->x, rectWorkArea->y); - tooltipMoved = TRUE; } rectWindow = meta_window_get_rect(window); // move tooltip out of bottom panel if necessary if ((rectWindow->y + rectWindow->height) > (rectWorkArea->y + rectWorkArea->height)) { meta_window_move(window, FALSE, rectWindow->x, rectWorkArea->y + rectWorkArea->height - rectWindow->height); - tooltipMoved = TRUE; - } - - if (tooltipMoved) { - clutter_container_add_actor (CLUTTER_CONTAINER (info->window_group), - CLUTTER_ACTOR (self)); - } - else { - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); } + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); }else{ clutter_container_add_actor (CLUTTER_CONTAINER (info->window_group), CLUTTER_ACTOR (self));