diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-02 21:32:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-02 21:32:56 +0000 |
| commit | bf87b7c6281f98b44f732c7c1c274129d83c5a7a (patch) | |
| tree | d595f39147e0ff2a6a7e1eb18b6170093942c547 /gtk/gtkprogressbar.c | |
| parent | b02ebc65e4a0aa3d6b198d5491589f4ac3e60365 (diff) | |
| download | gdk-pixbuf-bf87b7c6281f98b44f732c7c1c274129d83c5a7a.tar.gz | |
Use pango_layout_get_pixel_extents() to remove a large number of '/
Sun Jul 2 17:06:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c
gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvscale.c gtk/gtkaccellabel.c: Use
pango_layout_get_pixel_extents() to remove a large number of '/ PANGO_SCALE'.
* gtk/gtk[hv]ruler.c gtk/gtklabel.c: replace some / PANGO_SCALE with
PANGO_PIXELS() macro.
Diffstat (limited to 'gtk/gtkprogressbar.c')
| -rw-r--r-- | gtk/gtkprogressbar.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index a6cdade7d..770dbe9ef 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -365,7 +365,7 @@ gtk_progress_bar_size_request (GtkWidget *widget, layout = gtk_widget_create_pango_layout (widget); pango_layout_set_text (layout, buf, -1); - pango_layout_get_extents (layout, NULL, &logical_rect); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); g_object_unref (G_OBJECT (layout)); g_free (buf); @@ -378,11 +378,11 @@ gtk_progress_bar_size_request (GtkWidget *widget, { requisition->width = MAX (MIN_HORIZONTAL_BAR_WIDTH, 2 * widget->style->xthickness + 3 + - logical_rect.width / PANGO_SCALE + 2 * TEXT_SPACING); + logical_rect.width + 2 * TEXT_SPACING); requisition->height = MAX (MIN_HORIZONTAL_BAR_HEIGHT, 2 * widget->style->ythickness + 3 + - logical_rect.height / PANGO_SCALE + 2 * TEXT_SPACING); + logical_rect.height + 2 * TEXT_SPACING); } else { @@ -396,11 +396,11 @@ gtk_progress_bar_size_request (GtkWidget *widget, { requisition->width = MAX (MIN_VERTICAL_BAR_WIDTH, 2 * widget->style->xthickness + 3 + - logical_rect.width / PANGO_SCALE + 2 * TEXT_SPACING); + logical_rect.width + 2 * TEXT_SPACING); requisition->height = MAX (MIN_VERTICAL_BAR_HEIGHT, 2 * widget->style->ythickness + 3 + - logical_rect.height / PANGO_SCALE + 2 * TEXT_SPACING); + logical_rect.height + 2 * TEXT_SPACING); } else { @@ -712,16 +712,16 @@ gtk_progress_bar_paint (GtkProgress *progress) layout = gtk_widget_create_pango_layout (widget); pango_layout_set_text (layout, buf, -1); - pango_layout_get_extents (layout, NULL, &logical_rect); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); x = widget->style->xthickness + 1 + (widget->allocation.width - 2 * widget->style->xthickness - - 3 - logical_rect.width / PANGO_SCALE) + 3 - logical_rect.width) * progress->x_align; y = widget->style->ythickness + 1 + (widget->allocation.height - 2 * widget->style->ythickness - - 3 - logical_rect.height / PANGO_SCALE) + 3 - logical_rect.height) * progress->y_align; rect.x = widget->style->xthickness + 1; |