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/gtklabel.c | |
| parent | b02ebc65e4a0aa3d6b198d5491589f4ac3e60365 (diff) | |
| download | gtk+-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/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 3c30719e9c..31e74abf60 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -443,7 +443,7 @@ gtk_label_size_request (GtkWidget *widget, pango_layout_get_extents (label->layout, NULL, &logical_rect); requisition->width += aux_info->width; - requisition->height += logical_rect.height / PANGO_SCALE; + requisition->height += PANGO_PIXELS (logical_rect.height); } else { @@ -510,8 +510,8 @@ gtk_label_size_request (GtkWidget *widget, } pango_layout_set_width (label->layout, width); - requisition->width += real_width / PANGO_SCALE; - requisition->height += height / PANGO_SCALE; + requisition->width += PANGO_PIXELS (real_width); + requisition->height += PANGO_PIXELS (height); } } else /* !label->wrap */ @@ -519,8 +519,8 @@ gtk_label_size_request (GtkWidget *widget, pango_layout_set_width (label->layout, -1); pango_layout_get_extents (label->layout, NULL, &logical_rect); - requisition->width += logical_rect.width / PANGO_SCALE; - requisition->height += logical_rect.height / PANGO_SCALE; + requisition->width += PANGO_PIXELS (logical_rect.width); + requisition->height += PANGO_PIXELS (logical_rect.height); } } @@ -535,10 +535,7 @@ gtk_label_style_set (GtkWidget *widget, label = GTK_LABEL (widget); if (previous_style && label->layout) - { - g_object_unref (G_OBJECT (label->layout)); - label->layout = NULL; - } + pango_layout_context_changed (label->layout); } static void @@ -548,10 +545,7 @@ gtk_label_direction_changed (GtkWidget *widget, GtkLabel *label = GTK_LABEL (widget); if (label->layout) - { - g_object_unref (G_OBJECT (label->layout)); - label->layout = NULL; - } + pango_layout_context_changed (label->layout); GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir); } |