diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-05-04 00:24:46 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-05-04 00:24:46 +0000 |
| commit | d77c56a140de09163b310795aa1fddb66fa7dda6 (patch) | |
| tree | f480e81f0072fa0d00c3448d9e4c790bc3b1d4ce /gtk/gtktextlayout.c | |
| parent | 7250d57ad6769048ec262e15c4be169a0371a093 (diff) | |
| download | gtk+-d77c56a140de09163b310795aa1fddb66fa7dda6.tar.gz | |
Make GTK_JUSTIFY_FILL work, using pango_layout_set_justify() that works
2007-05-03 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (gtk_label_ensure_layout):
* gtk/gtktextlayout.c (set_para_values): Make GTK_JUSTIFY_FILL work,
using pango_layout_set_justify() that works now. (#435675)
svn path=/trunk/; revision=17790
Diffstat (limited to 'gtk/gtktextlayout.c')
| -rw-r--r-- | gtk/gtktextlayout.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index ae4be03e54..553434a076 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1201,7 +1201,7 @@ set_para_values (GtkTextLayout *layout, GtkTextLineDisplay *display) { PangoAlignment pango_align = PANGO_ALIGN_LEFT; - int layout_width; + PangoWrapMode pango_wrap = PANGO_WRAP_WORD; switch (base_dir) { @@ -1241,7 +1241,8 @@ set_para_values (GtkTextLayout *layout, pango_align = PANGO_ALIGN_CENTER; break; case GTK_JUSTIFY_FILL: - g_warning ("FIXME we don't support GTK_JUSTIFY_FILL yet"); + pango_align = (base_dir == PANGO_DIRECTION_LTR) ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT; + pango_layout_set_justify (display->layout, TRUE); break; default: g_assert_not_reached (); @@ -1269,26 +1270,27 @@ set_para_values (GtkTextLayout *layout, switch (style->wrap_mode) { case GTK_WRAP_CHAR: - layout_width = layout->screen_width - display->left_margin - display->right_margin; - pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); - pango_layout_set_wrap (display->layout, PANGO_WRAP_CHAR); + pango_wrap = PANGO_WRAP_CHAR; break; case GTK_WRAP_WORD: - layout_width = layout->screen_width - display->left_margin - display->right_margin; - pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); - pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD); + pango_wrap = PANGO_WRAP_WORD; break; case GTK_WRAP_WORD_CHAR: - layout_width = layout->screen_width - display->left_margin - display->right_margin; - pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); - pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD_CHAR); + pango_wrap = PANGO_WRAP_WORD_CHAR; break; case GTK_WRAP_NONE: break; } + if (style->wrap_mode != GTK_WRAP_NONE) + { + int layout_width = (layout->screen_width - display->left_margin - display->right_margin); + pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); + pango_layout_set_wrap (display->layout, pango_wrap); + } + display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; if (style->pg_bg_color) |