From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sat, 31 Oct 2009 16:33:35 +0000 (+0000)
Subject: fixed tooltip_adjust_geometry with multi monitor
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=8a24822a1c1cafcbd55a9225314b01cab5e4d82a;p=chaz%2Ftint2

fixed tooltip_adjust_geometry with multi monitor
---

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 5d8b90f..3d8c7aa 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -146,7 +146,10 @@ void tooltip_update_geometry()
 	else if (panel_position & LEFT)
 		x = panel->posx + panel->area.width;
 	else
-			x = panel->posx - width;
+		x = panel->posx - width;
+			
+	//printf("tooltip_update_geometry x_root %d, y_root %d\n", x, y);
+	//printf("  panel posx %d, posy %d\n", panel->posx, panel->posy);
 	g_object_unref(layout);
 	cairo_destroy(c);
 	cairo_surface_destroy(cs);
@@ -160,8 +163,8 @@ void tooltip_adjust_geometry()
 
 	int min_x, min_y, max_width, max_height;
 	Panel* panel = g_tooltip.task->area.panel;
-	int screen_width = server.monitor[panel->monitor].width;
-	int screen_height = server.monitor[panel->monitor].height;
+	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)
 		return;    // no adjustment needed
 
@@ -184,10 +187,10 @@ void tooltip_adjust_geometry()
 			min_x=0;
 	}
 
-	if (x+width > server.monitor[panel->monitor].width)
-		x = server.monitor[panel->monitor].width-width;
-	if ( y+height>server.monitor[panel->monitor].height)
-		y = server.monitor[panel->monitor].height-height;
+	if (x+width > server.monitor[panel->monitor].x + server.monitor[panel->monitor].width)
+		x = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width - width;
+	if ( y+height > server.monitor[panel->monitor].y + server.monitor[panel->monitor].height)
+		y = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height - height;
 
 	if (x<min_x)
 		x=min_x;
@@ -197,6 +200,7 @@ void tooltip_adjust_geometry()
 		y=min_y;
 	if (height>max_height)
 		height=max_height;
+	//printf("tooltip_adjust_geometry x_root %d, y_root %d\n", x, y);
 }
 
 void tooltip_update()