From 73b0f2bc458593c0162ab0fa8d24a40c7ffe2d1b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Nov 2004 03:36:35 +0000 Subject: [PATCH] Also reserve space for the resize grip if the grip_window is not realized 2004-11-11 Matthias Clasen * 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) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkstatusbar.c | 18 +++++++++++------- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17a99dd757..f48edfe0c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-11-11 Matthias Clasen + + * 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 Fix for #137551, by Robert Ögren: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 17a99dd757..f48edfe0c0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-11-11 Matthias Clasen + + * 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 Fix for #137551, by Robert Ögren: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 17a99dd757..f48edfe0c0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-11-11 Matthias Clasen + + * 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 Fix for #137551, by Robert Ögren: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 17a99dd757..f48edfe0c0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-11-11 Matthias Clasen + + * 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 Fix for #137551, by Robert Ögren: diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 8c29f93fff..e985ac3ac6 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -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) {