changeset 7719:853ef377a850

[gaim-migrate @ 8364] Q: What do you get when Sean writes code drunk? A: The cracked out code that auto-contracted persons with more than two buddies, fixed in this commit. Q: What do you get when Sean writes code tired? A: The cracked out code to prevent the tooltip from going off the top of the screen, included in this commit. committer: Tailor Script <[e-mail]>

--- a/src/gtkblist.c	Wed Dec 03 05:18:07 2003 +0000
+++ b/src/gtkblist.c	Wed Dec 03 06:12:55 2003 +0000
@@ -1479,6 +1479,7 @@
 	gtknode = node->ui_data;
 
 	if (node->child && node->child->next && GAIM_BLIST_NODE_IS_CONTACT(node) && !gtknode->contact_expanded) {
+		GtkTreeIter i;
 		gaim_gtk_blist_expand_contact_cb(NULL, node);
 		tooltip_top = TRUE; /* When the person expands, the new screennames will be below.  We'll draw the tip above
 				       the cursor so that the user can see the included buddies */
@@ -1489,18 +1490,11 @@
 		gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &gtkblist->contact_rect);
 		gtkblist->mouseover_contact = node;
 		gtk_tree_path_down (path);
-		while (1) {
-			GtkTreePath *path2;
+		while (gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &i, path)) {
 			GdkRectangle rect;
 			gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &rect);
 			gtkblist->contact_rect.height += rect.height;
-			path2 = path;
 			gtk_tree_path_next(path); 
-			if (path2 == path) {
-				gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path2, NULL, &rect);
-				gtkblist->contact_rect.height += rect.height;
-				break;
-			}
 		}
 	}
 
@@ -1566,16 +1560,25 @@
 
 	x -= ((w >> 1) + 4);
 
-	if ((x + w) > scr_w)
-		x -= (x + w + 5) - scr_w;
-	else if (x < 0)
-		x = 0;
-
 	if ((y + h + 4) > scr_h || tooltip_top)
 		y = y - h - 5;
 	else
 		y = y + 6;
 
+	if (y < 0)
+		y = 0;
+	
+	if (y != 0) {
+		if ((x + w) > scr_w)
+			x -= (x + w + 5) - scr_w;
+		else if (x < 0)
+			x = 0;
+	} else {
+		x -= (w / 2 + 10);
+		if (x < 0)
+			x += w + 15;
+	}
+
 	g_object_unref (layout);
 	g_free(tooltiptext);
 	gtk_widget_set_size_request(gtkblist->tipwindow, w, h);