Fix area lookup coordinates in tooltip_show()

[chaz/tint2] / src / tooltip / tooltip.c

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index dd7166eb0cc4b6b7098d4187bc459bea15c33e5c..05da0d03588a7aa9c2647431607641bf0d835af1 100644 (file)
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -99,7 +99,10 @@ 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);
+       Area* area;
+       if (!panel_horizontal)
+               my += height/2; /* we adjusted y in tooltip_trigger_show, revert or we won't find the correct area anymore */
+       area = click_area(g_tooltip.panel, mx, my);
        stop_tooltip_timeout();
        if (!g_tooltip.mapped && area->_get_tooltip_text) {
                tooltip_copy_text(area);
@@ -151,22 +154,22 @@ void tooltip_adjust_geometry()
        Panel* panel = g_tooltip.panel;
        int screen_width = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width;
        int screen_height = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height;
-       if ( x+width <= screen_width && y+height <= screen_height && x>=0 && y>=0)
+       if ( x+width <= screen_width && y+height <= screen_height && x>=server.monitor[panel->monitor].x && y>=server.monitor[panel->monitor].y )
                return;    // no adjustment needed
 
        if (panel_horizontal) {
                min_x=0;
-               max_width=screen_width;
-               max_height=screen_height-panel->area.height;
+               max_width=server.monitor[panel->monitor].width;
+               max_height=server.monitor[panel->monitor].height-panel->area.height;
                if (panel_position & BOTTOM)
                        min_y=0;
                else
                        min_y=panel->area.height;
        }
        else {
-               max_width=screen_width-panel->area.width;
+               max_width=server.monitor[panel->monitor].width-panel->area.width;
                min_y=0;
-               max_height=screen_height;
+               max_height=server.monitor[panel->monitor].height;
                if (panel_position & LEFT)
                        min_x=panel->area.width;
                else