From 623370a8e7cbb6b73939ce70430019cf2f76aae8 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 1 Feb 2004 15:18:32 +0000 Subject: [PATCH] Make sure item_area is positioned correctly. Fix #133070, reported by Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure item_area is positioned correctly. Fix #133070, reported by Jeroen Zwartepoorte. --- 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 878e8e02a1..581635d56e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Feb 1 16:03:39 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure + item_area is positioned correctly. Fix #133070, reported by Jeroen + Zwartepoorte. + Sat Jan 31 23:13:43 2004 Matthias Clasen * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 878e8e02a1..581635d56e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Feb 1 16:03:39 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure + item_area is positioned correctly. Fix #133070, reported by Jeroen + Zwartepoorte. + Sat Jan 31 23:13:43 2004 Matthias Clasen * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 878e8e02a1..581635d56e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Feb 1 16:03:39 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure + item_area is positioned correctly. Fix #133070, reported by Jeroen + Zwartepoorte. + Sat Jan 31 23:13:43 2004 Matthias Clasen * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 878e8e02a1..581635d56e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Feb 1 16:03:39 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure + item_area is positioned correctly. Fix #133070, reported by Jeroen + Zwartepoorte. + Sat Jan 31 23:13:43 2004 Matthias Clasen * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 878e8e02a1..581635d56e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Feb 1 16:03:39 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure + item_area is positioned correctly. Fix #133070, reported by Jeroen + Zwartepoorte. + Sat Jan 31 23:13:43 2004 Matthias Clasen * gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 45f98d4819..94524f7519 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1444,8 +1444,8 @@ gtk_toolbar_size_allocate (GtkWidget *widget, arrow_allocation.y = border_width; } - item_area.x = 0; - item_area.y = 0; + item_area.x = border_width; + item_area.y = border_width; item_area.width = available_size - (need_arrow? arrow_size : 0); item_area.height = short_size;