Go back to old style of drawing children over the bevel. (#58615)

Wed Feb 27 14:45:21 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Go
        back to old style of drawing children over the bevel.
        (#58615)
This commit is contained in:
Owen Taylor 2002-02-27 19:48:30 +00:00 committed by Owen Taylor
parent 39fc3c9a3c
commit 0be9b6fba8
8 changed files with 46 additions and 4 deletions

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -1,3 +1,9 @@
Wed Feb 27 14:45:21 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* modules/input/imxim.c: Add ko and zh to the locales

View File

@ -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;