From 0230821081ce827a1fad08dc4d4a5fc80ff31547 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Apr 2003 18:19:46 +0000 Subject: [PATCH] Add GTK_WRAP_WORD_CHAR. (#110086, David Brigada) * gtk/gtktextlayout.c (set_para_values): * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, David Brigada) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ docs/reference/ChangeLog | 2 ++ docs/reference/gtk/tmpl/gtktexttag.sgml | 2 ++ gtk/gtkenums.h | 3 ++- gtk/gtktextlayout.c | 6 ++++++ 9 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2331bd3910..f21fa0f0f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-04-07 Matthias Clasen + * gtk/gtktextlayout.c (set_para_values): + * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, + David Brigada) + * gtk/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous misspellings of possessive "its". (#110027, Doug Quale) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2331bd3910..f21fa0f0f6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2003-04-07 Matthias Clasen + * gtk/gtktextlayout.c (set_para_values): + * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, + David Brigada) + * gtk/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous misspellings of possessive "its". (#110027, Doug Quale) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2331bd3910..f21fa0f0f6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2003-04-07 Matthias Clasen + * gtk/gtktextlayout.c (set_para_values): + * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, + David Brigada) + * gtk/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous misspellings of possessive "its". (#110027, Doug Quale) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2331bd3910..f21fa0f0f6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2003-04-07 Matthias Clasen + * gtk/gtktextlayout.c (set_para_values): + * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, + David Brigada) + * gtk/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous misspellings of possessive "its". (#110027, Doug Quale) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2331bd3910..f21fa0f0f6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2003-04-07 Matthias Clasen + * gtk/gtktextlayout.c (set_para_values): + * gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR. (#110086, + David Brigada) + * gtk/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous misspellings of possessive "its". (#110027, Doug Quale) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 0d65a6d42e..38ac2a86c8 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,7 @@ 2003-04-07 Matthias Clasen + * gtk/tmpl/gtktexttag.sgml: Document GTK_WRAP_WORD_CHAR. (#110086) + * gtk/tmpl/gtkenums.sgml, gtk/tmpl/gtkmain.sgml, gtk/tmpl/gtkpaned.sgml, gtk/tmpl/gtkradiobutton.sgml, gtk/tmpl/gtkspinbutton.sgml, gtk/tmpl/gtkstatusbar.sgml, diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index 34119845a8..dd5f871a59 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -49,6 +49,8 @@ Describes a type of line wrapping. be technical, between graphemes, see pango_get_log_attrs()) @GTK_WRAP_WORD: wrap text, breaking lines in between words +@GTK_WRAP_WORD_CHAR: wrap text, breaking lines in between words, or if + that is not enough, also between graphemes. diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index fadfd3887a..d558dbfa42 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -416,7 +416,8 @@ typedef enum { GTK_WRAP_NONE, GTK_WRAP_CHAR, - GTK_WRAP_WORD + GTK_WRAP_WORD, + GTK_WRAP_WORD_CHAR } GtkWrapMode; /* How to sort */ diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index b5cdae7422..83dbb96037 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1156,6 +1156,12 @@ set_para_values (GtkTextLayout *layout, pango_layout_set_wrap (display->layout, 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); + break; + case GTK_WRAP_NONE: break; }