Subtract off twice the border width from the width/height, not 1x the

Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off
        twice the border width from the width/height, not
        1x the border width. (#106336, Rodney Dawes)

diff --git a/ChangeLog b/ChangeLog
index c674f21a42d98c901e449291275103cbb92b49a4..93308a10ddc12e156084d566fc67468943f51ff1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c674f21a42d98c901e449291275103cbb92b49a4..93308a10ddc12e156084d566fc67468943f51ff1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c674f21a42d98c901e449291275103cbb92b49a4..93308a10ddc12e156084d566fc67468943f51ff1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c674f21a42d98c901e449291275103cbb92b49a4..93308a10ddc12e156084d566fc67468943f51ff1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c674f21a42d98c901e449291275103cbb92b49a4..93308a10ddc12e156084d566fc67468943f51ff1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 132a2564b3486c81eb5326afc15658f4d157c57d..df217b99e898a897b43f640825d25c1414708130 100644 (file)
--- 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)
        {