AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-10-01 03:27:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix grip window positioning

Browse Source 
We need to position the grip window in size_allocate after all,
otherwise the grip ends up in the wrong place when the window
is realized early.

Also, avoid shadowing a variable.
This commit is contained in:
Matthias Clasen 2010-10-08 14:21:11 -04:00
parent 0ebf090d9e
commit 31a45c957c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkwindow.c
View File

@ -4730,7 +4730,11 @@ gtk_window_realize (GtkWidget *widget)
allocation.height == 1)
{
GtkRequisition requisition;
GtkAllocation allocation = { 0, 0, 200, 200 };
allocation.x = 0;
allocation.y = 0;
allocation.width = 200;
allocation.height = 200;
gtk_widget_get_preferred_size (widget, &requisition, NULL);
if (requisition.width || requisition.height)
@ -4784,7 +4788,7 @@ gtk_window_realize (GtkWidget *widget)
GDK_BUTTON_RELEASE_MASK);
attributes_mask = GDK_WA_VISUAL;
priv->frame = gdk_window_new (gtk_widget_get_root_window (widget),
&attributes, attributes_mask);
@ -5061,11 +5065,13 @@ gtk_window_size_allocate (GtkWidget *widget,
gtk_widget_size_allocate (child, &child_allocation);
}
if (gtk_widget_get_realized (widget) && priv->frame)
if (gtk_widget_get_realized (widget))
{
gdk_window_resize (priv->frame,
allocation->width + priv->frame_left + priv->frame_right,
allocation->height + priv->frame_top + priv->frame_bottom);
if (priv->frame)
gdk_window_resize (priv->frame,
allocation->width + priv->frame_left + priv->frame_right,
allocation->height + priv->frame_top + priv->frame_bottom);
set_grip_position (window);
}
}
@ -6720,12 +6726,9 @@ gtk_window_move_resize (GtkWindow *window)
/* gtk_window_configure_event() filled in widget->allocation */
gtk_widget_size_allocate (widget, &allocation);
if (priv->grip_window != NULL)
{
set_grip_position (window);
set_grip_cursor (window);
set_grip_shape (window);
}
set_grip_position (window);
set_grip_cursor (window);
set_grip_shape (window);
gdk_window_process_updates (gdk_window, TRUE);