Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2024/src
Modified Files:
gtkblist.c
Log Message:
make tooltips with shadows not blow up in the corner
Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -p -r1.115 -r1.116
--- gtkblist.c 20 Oct 2003 05:08:05 -0000 1.115
+++ gtkblist.c 20 Oct 2003 14:00:11 -0000 1.116
@@ -348,31 +348,31 @@ map_shadow_windows (gpointer data)
int x, y;
gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
- pixbuf = get_pixbuf (widget,
+ pixbuf = get_pixbuf (widget,
x + widget->allocation.width, y,
- 5, widget->allocation.height);
- if (pixbuf != NULL)
- {
- pixbuf_add_shadow (pixbuf, EAST_SIDE);
- if (blist->east != NULL)
+ 5, widget->allocation.height + 5);
+ if (pixbuf != NULL)
{
- g_object_unref (G_OBJECT (blist->east));
+ pixbuf_add_shadow (pixbuf, EAST_SIDE);
+ if (blist->east != NULL)
+ {
+ g_object_unref (G_OBJECT (blist->east));
+ }
+ blist->east = pixbuf;
}
- blist->east = pixbuf;
- }
-
- pixbuf = get_pixbuf (widget,
- x, y + widget->allocation.height,
- widget->allocation.width + 5, 5);
- if (pixbuf != NULL)
- {
- pixbuf_add_shadow (pixbuf, SOUTH_SIDE);
- if (blist->south != NULL)
+
+ pixbuf = get_pixbuf (widget,
+ x, y + widget->allocation.height,
+ widget->allocation.width + 5, 5);
+ if (pixbuf != NULL)
{
- g_object_unref (G_OBJECT (blist->south));
+ pixbuf_add_shadow (pixbuf, SOUTH_SIDE);
+ if (blist->south != NULL)
+ {
+ g_object_unref (G_OBJECT (blist->south));
+ }
+ blist->south = pixbuf;
}
- blist->south = pixbuf;
- }
gdk_window_move_resize (blist->east_shadow,
x + widget->allocation.width, y,
@@ -1334,14 +1334,15 @@ static gboolean gaim_gtk_blist_tooltip_t
x -= ((w >> 1) + 4);
if ((x + w) > scr_w)
- x -= (x + w) - scr_w;
+ x -= (x + w + 5) - scr_w;
else if (x < 0)
x = 0;
if ((y + h + 4) > scr_h)
- y = y - h;
+ y = y - h - 5;
else
y = y + 6;
+
g_object_unref (layout);
g_free(tooltiptext);
gtk_widget_set_size_request(gtkblist->tipwindow, w, h);
|
