X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=dd7166eb0cc4b6b7098d4187bc459bea15c33e5c;hb=39e76e43d441ad2d066339ba47e07e77bda249bc;hp=d703a2ed17706071cacf6fe55049f2097d5982ff;hpb=4dfce699f6879b5638b044affa6972581ef04bf6;p=chaz%2Ftint2 diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c index d703a2e..dd7166e 100644 --- a/src/tooltip/tooltip.c +++ b/src/tooltip/tooltip.c @@ -27,7 +27,7 @@ #include "panel.h" #include "timer.h" -static int x_original, y_original, x, y, width, height; +static int x, y, width, height; // the next functions are helper functions for tooltip handling void start_show_timeout(); @@ -78,8 +78,10 @@ void init_tooltip() void tooltip_trigger_show(Area* area, Panel* p, XEvent *e) { // Position the tooltip in the center of the area - x = x_original = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x; - y = y_original = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y; + x = area->posx + area->width / 2 + e->xmotion.x_root - e->xmotion.x; + y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y; + if (!panel_horizontal) + y -= height/2; g_tooltip.panel = p; if (g_tooltip.mapped && g_tooltip.area != area) { tooltip_copy_text(area); @@ -124,9 +126,6 @@ void tooltip_update_geometry() width = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingx + r2.width; height = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingy + r2.height; - x = x_original; - y = y_original; - Panel* panel = g_tooltip.panel; if (panel_horizontal && panel_position & BOTTOM) y = panel->posy-height; @@ -137,9 +136,6 @@ void tooltip_update_geometry() else x = panel->posx - width; - if (!panel_horizontal) - y -= height/2; - g_object_unref(layout); cairo_destroy(c); cairo_surface_destroy(cs);