callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with resize handles

Browse Source 
The resize handles were not correctly redrawn and not positioned
correctly, initially.
This commit is contained in:
Matthias Clasen
2009-07-24 00:45:34 -04:00
parent 9d69355e6f
commit 9660bfe9da
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkstatusbar.c
View File

@ -198,6 +198,8 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
box = GTK_BOX (statusbar); box = GTK_BOX (statusbar);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), TRUE);
box->spacing = 2; box->spacing = 2;
box->homogeneous = FALSE; box->homogeneous = FALSE;
@ -616,10 +618,10 @@ gtk_statusbar_create_window (GtkStatusbar *statusbar)
GdkWindowAttr attributes; GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
GdkRectangle rect; GdkRectangle rect;
g_return_if_fail (GTK_WIDGET_REALIZED (statusbar)); g_return_if_fail (GTK_WIDGET_REALIZED (statusbar));
g_return_if_fail (statusbar->has_resize_grip); g_return_if_fail (statusbar->has_resize_grip);
widget = GTK_WIDGET (statusbar); widget = GTK_WIDGET (statusbar);
get_grip_rect (statusbar, &rect); get_grip_rect (statusbar, &rect);
@ -640,6 +642,8 @@ gtk_statusbar_create_window (GtkStatusbar *statusbar)
gdk_window_set_user_data (statusbar->grip_window, widget); gdk_window_set_user_data (statusbar->grip_window, widget);
gdk_window_raise (statusbar->grip_window);
set_grip_cursor (statusbar); set_grip_cursor (statusbar);
} }
@ -858,10 +862,10 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
if (statusbar->has_resize_grip) if (statusbar->has_resize_grip)
{ {
get_grip_rect (statusbar, &rect); get_grip_rect (statusbar, &rect);
extra_children = has_extra_children (statusbar); extra_children = has_extra_children (statusbar);
/* If there are extra children, we don't want them to occupy /* If there are extra children, we don't want them to occupy
* the space where we draw the resize grip, so we temporarily * the space where we draw the resize grip, so we temporarily
* shrink the allocation. * shrink the allocation.
@ -882,14 +886,6 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
if (statusbar->has_resize_grip) if (statusbar->has_resize_grip)
{ {
if (statusbar->grip_window)
{
gdk_window_raise (statusbar->grip_window);
gdk_window_move_resize (statusbar->grip_window,
rect.x, rect.y,
rect.width, rect.height);
}
if (extra_children) if (extra_children)
{ {
allocation->width += rect.width; allocation->width += rect.width;
@ -913,12 +909,23 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
/* shrink the label to make room for the grip */ /* shrink the label to make room for the grip */
*allocation = child->allocation; *allocation = child->allocation;
allocation->width = MAX (1, allocation->width - rect.width); allocation->width = MAX (1, allocation->width - rect.width);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
allocation->x += child->allocation.width - allocation->width; allocation->x += child->allocation.width - allocation->width;
gtk_widget_size_allocate (child, allocation); gtk_widget_size_allocate (child, allocation);
} }
} }
if (statusbar->grip_window)
{
get_grip_rect (statusbar, &rect);
gdk_window_raise (statusbar->grip_window);
gdk_window_move_resize (statusbar->grip_window,
rect.x, rect.y,
rect.width, rect.height);
}
} }
} }