Also reserve space for the resize grip if the grip_window is not realized

2004-11-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
	reserve space for the resize grip if the grip_window is not
	realized yet.  (#158010, Christian Persch)
	(gtk_statusbar_button_press): Only start a resize if the
	button press comes from the grip_window.  (#158011, Christian Persch)
This commit is contained in:
Matthias Clasen 2004-11-12 03:36:35 +00:00 committed by Matthias Clasen
parent 430a02d854
commit 73b0f2bc45
5 changed files with 43 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)
(gtk_statusbar_button_press): Only start a resize if the
button press comes from the grip_window. (#158011, Christian Persch)
2004-11-11 Tor Lillqvist <tml@iki.fi>
Fix for #137551, by Robert Ögren:

View File

@ -1,3 +1,11 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)
(gtk_statusbar_button_press): Only start a resize if the
button press comes from the grip_window. (#158011, Christian Persch)
2004-11-11 Tor Lillqvist <tml@iki.fi>
Fix for #137551, by Robert Ögren:

View File

@ -1,3 +1,11 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)
(gtk_statusbar_button_press): Only start a resize if the
button press comes from the grip_window. (#158011, Christian Persch)
2004-11-11 Tor Lillqvist <tml@iki.fi>
Fix for #137551, by Robert Ögren:

View File

@ -1,3 +1,11 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)
(gtk_statusbar_button_press): Only start a resize if the
button press comes from the grip_window. (#158011, Christian Persch)
2004-11-11 Tor Lillqvist <tml@iki.fi>
Fix for #137551, by Robert Ögren:

View File

@ -684,7 +684,8 @@ gtk_statusbar_button_press (GtkWidget *widget,
statusbar = GTK_STATUSBAR (widget);
if (!statusbar->has_resize_grip ||
event->type != GDK_BUTTON_PRESS)
event->type != GDK_BUTTON_PRESS ||
event->window != statusbar->grip_window)
return FALSE;
ancestor = gtk_widget_get_toplevel (widget);
@ -803,7 +804,7 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
gboolean extra_children;
GdkRectangle rect, overlap;
if (statusbar->has_resize_grip && statusbar->grip_window)
if (statusbar->has_resize_grip)
{
widget->allocation = *allocation;
get_grip_rect (statusbar, &rect);
@ -828,12 +829,15 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
/* chain up normally */
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (statusbar->has_resize_grip && statusbar->grip_window)
if (statusbar->has_resize_grip)
{
gdk_window_raise (statusbar->grip_window);
gdk_window_move_resize (statusbar->grip_window,
rect.x, rect.y,
rect.width, rect.height);
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)
{