X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftooltip%2Ftooltip.c;h=d703a2ed17706071cacf6fe55049f2097d5982ff;hb=77c33a531f505a41491d415de36af6fb9ee7b178;hp=1c195047facedaf5af0155d8aa5a64d2496b8ee2;hpb=e050df33d29de6f7890b7111f6ea871aa5247743;p=chaz%2Ftint2

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 1c19504..d703a2e 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -27,7 +27,7 @@
 #include "panel.h"
 #include "timer.h"
 
-static int x, y, width, height;
+static int x_original, y_original, x, y, width, height;
 
 // the next functions are helper functions for tooltip handling
 void start_show_timeout();
@@ -50,7 +50,6 @@ void default_tooltip()
 
 void cleanup_tooltip()
 {
-printf("*** cleanup_tooltip()\n");
 	stop_tooltip_timeout();
 	tooltip_hide(0);
 	tooltip_copy_text(0);
@@ -76,10 +75,11 @@ void init_tooltip()
 }
 
 
-void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
+void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
 {
-	x = x_root;
-	y = y_root;
+	// 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;
 	g_tooltip.panel = p;
 	if (g_tooltip.mapped && g_tooltip.area != area) {
 		tooltip_copy_text(area);
@@ -94,10 +94,10 @@ void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
 
 void tooltip_show(void* arg)
 {
-  int mx, my;
-  Window w;
-  XTranslateCoordinates( server.dsp, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
-  Area* area = click_area(g_tooltip.panel, mx, my);
+	int mx, my;
+	Window w;
+	XTranslateCoordinates( server.dsp, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
+	Area* area = click_area(g_tooltip.panel, mx, my);
 	stop_tooltip_timeout();
 	if (!g_tooltip.mapped && area->_get_tooltip_text) {
 		tooltip_copy_text(area);
@@ -124,6 +124,9 @@ 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;
@@ -134,6 +137,9 @@ 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);