From 27c08ab4b00deaa79ba8e5b88650b1934b71e006 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 5 Jun 2003 23:37:03 +0000 Subject: [PATCH] Subtract off twice the border width from the width/height, not 1x the Thu Jun 5 19:24:33 2003 Owen Taylor * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off twice the border width from the width/height, not 1x the border width. (#106336, Rodney Dawes) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 4 ++-- 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c674f21a4..93308a10d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 5 19:24:33 2003 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off + twice the border width from the width/height, not + 1x the border width. (#106336, Rodney Dawes) + Thu Jun 5 15:33:38 2003 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c674f21a4..93308a10d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jun 5 19:24:33 2003 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off + twice the border width from the width/height, not + 1x the border width. (#106336, Rodney Dawes) + Thu Jun 5 15:33:38 2003 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c674f21a4..93308a10d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Jun 5 19:24:33 2003 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off + twice the border width from the width/height, not + 1x the border width. (#106336, Rodney Dawes) + Thu Jun 5 15:33:38 2003 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c674f21a4..93308a10d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jun 5 19:24:33 2003 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off + twice the border width from the width/height, not + 1x the border width. (#106336, Rodney Dawes) + Thu Jun 5 15:33:38 2003 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c674f21a4..93308a10d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jun 5 19:24:33 2003 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off + twice the border width from the width/height, not + 1x the border width. (#106336, Rodney Dawes) + Thu Jun 5 15:33:38 2003 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 132a2564b..df217b99e 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -561,8 +561,8 @@ gtk_toolbar_expose (GtkWidget *widget, &event->area, widget, "toolbar", widget->allocation.x + border_width, widget->allocation.y + border_width, - widget->allocation.width - border_width, - widget->allocation.height - border_width); + widget->allocation.width - 2 * border_width, + widget->allocation.height - 2 * border_width); for (children = toolbar->children; children; children = children->next) { -- 2.43.2