don't offset one pixel when calculating the x position of the text.

Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
	one pixel when calculating the x position of the text.

diff --git a/ChangeLog b/ChangeLog
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b46efb4102a23879f71ce95c698dc7f7350294c..b3f26883a19ce7c6f92b5ffec6ee1d1d880604ab 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Nov 26 01:55:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): don't offset
+       one pixel when calculating the x position of the text.
+
 Tue Nov 26 00:40:53 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 94aefc1049d243242023fcfb42aaa95f22fdbbbc..b679722b85776aaab62d2f9d7a3ef08f382746f3 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -738,14 +738,14 @@ gtk_progress_bar_paint_text (GtkProgressBar            *pbar,
   layout = gtk_widget_create_pango_layout (widget, buf);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
   
-  x = widget->style->xthickness + 1 + 
+  x = widget->style->xthickness + 1 +
     (widget->allocation.width - 2 * widget->style->xthickness -
-     3 - logical_rect.width)
+     2 - logical_rect.width)
     * progress->x_align; 
 
   y = widget->style->ythickness + 1 +
     (widget->allocation.height - 2 * widget->style->ythickness -
-     3 - logical_rect.height)
+     2 - logical_rect.height)
     * progress->y_align;
 
   rect.x = widget->style->xthickness;