From: Soeren Sandmann Date: Tue, 26 Nov 2002 01:13:27 +0000 (+0000) Subject: don't offset one pixel when calculating the x position of the text. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c7eb1aaf55c3604349a8e8735d14bcd6797ff0e8;hp=e6107bc236fc60f8e663d6ae9d8d52c95631dc3e;p=~andy%2Fgtk don't offset one pixel when calculating the x position of the text. Tue Nov 26 01:55:47 2002 Soeren Sandmann * 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 7b46efb41..b3f26883a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7b46efb41..b3f26883a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7b46efb41..b3f26883a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7b46efb41..b3f26883a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7b46efb41..b3f26883a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7b46efb41..b3f26883a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Nov 26 01:55:47 2002 Soeren Sandmann + + * 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 * gtk/gtkprogressbar.c (gtk_progress_bar_paint_text): draw text diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 94aefc104..b679722b8 100644 --- 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;