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/gtkvscale.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/gtkvscale.c')
| -rw-r--r-- | gtk/gtkvscale.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 0432e83ee..dd5782846 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -532,7 +532,7 @@ gtk_vscale_draw_value (GtkScale *scale) layout = gtk_widget_create_pango_layout (widget); pango_layout_set_text (layout, buffer, strlen (buffer)); - pango_layout_get_extents (layout, NULL, &logical_rect); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); switch (scale->value_pos) { @@ -542,9 +542,9 @@ gtk_vscale_draw_value (GtkScale *scale) gdk_window_get_size (GTK_RANGE (scale)->trough, &width, NULL); gdk_window_get_size (GTK_RANGE (scale)->slider, NULL, &height); - x -= SCALE_CLASS (scale)->value_spacing + logical_rect.width / PANGO_SCALE; - y += widget->allocation.y + (height - logical_rect.height / PANGO_SCALE) / 2 + - PANGO_ASCENT (logical_rect) / PANGO_SCALE; + x -= SCALE_CLASS (scale)->value_spacing + logical_rect.width; + y += widget->allocation.y + (height - logical_rect.height) / 2 + + PANGO_ASCENT (logical_rect); break; case GTK_POS_RIGHT: gdk_window_get_position (GTK_RANGE (scale)->trough, &x, NULL); @@ -553,24 +553,24 @@ gtk_vscale_draw_value (GtkScale *scale) gdk_window_get_size (GTK_RANGE (scale)->slider, NULL, &height); x += width + SCALE_CLASS (scale)->value_spacing; - y += widget->allocation.y + (height - logical_rect.height / PANGO_SCALE) / 2 + - PANGO_ASCENT (logical_rect) / PANGO_SCALE; + y += widget->allocation.y + (height - logical_rect.height) / 2 + + PANGO_ASCENT (logical_rect); break; case GTK_POS_TOP: gdk_window_get_position (GTK_RANGE (scale)->trough, &x, &y); gdk_window_get_size (GTK_RANGE (scale)->slider, &width, NULL); gdk_window_get_size (GTK_RANGE (scale)->trough, NULL, &height); - x += (width - logical_rect.width / PANGO_SCALE) / 2; - y -= PANGO_DESCENT (logical_rect) / PANGO_SCALE; + x += (width - logical_rect.width) / 2; + y -= PANGO_DESCENT (logical_rect); break; case GTK_POS_BOTTOM: gdk_window_get_position (GTK_RANGE (scale)->trough, &x, &y); gdk_window_get_size (GTK_RANGE (scale)->slider, &width, NULL); gdk_window_get_size (GTK_RANGE (scale)->trough, NULL, &height); - x += (width - logical_rect.width / PANGO_SCALE) / 2; - y += height + PANGO_ASCENT (logical_rect) / PANGO_SCALE; + x += (width - logical_rect.width) / 2; + y += height + PANGO_ASCENT (logical_rect); break; } |