From 0be9b6fba856ee2d919f208beb9a0fbf19b55518 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Feb 2002 19:48:30 +0000 Subject: [PATCH] Go back to old style of drawing children over the bevel. (#58615) Wed Feb 27 14:45:21 2002 Owen Taylor * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go back to old style of drawing children over the bevel. (#58615) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 8 ++++---- 8 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ae42ff1dc..a1707eceb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Feb 27 14:45:21 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go + back to old style of drawing children over the bevel. + (#58615) + Wed Feb 27 14:08:26 2002 Owen Taylor * modules/input/imxim.c: Add ko and zh to the locales diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index ac6d1d14b..222b65dae 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -657,8 +657,8 @@ gtk_toolbar_size_request (GtkWidget *widget, /* Extra spacing */ gtk_widget_style_get (widget, "internal_padding", &ipadding, NULL); - requisition->width += 2 * (widget->style->xthickness + ipadding); - requisition->height += 2 * (widget->style->ythickness + ipadding); + requisition->width += 2 * ipadding; + requisition->height += 2 * ipadding; toolbar->button_maxw = button_maxw; toolbar->button_maxh = button_maxh; @@ -689,8 +689,8 @@ gtk_toolbar_size_allocate (GtkWidget *widget, gtk_widget_style_get (widget, "internal_padding", &ipadding, NULL); - x_border_width += 2 * (widget->style->xthickness + ipadding); - y_border_width += 2 * (widget->style->ythickness + ipadding); + x_border_width += ipadding; + y_border_width += ipadding; if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) alloc.x = allocation->x + x_border_width; -- 2.43.2