callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add GTK_WRAP_WORD_CHAR. (#110086, David Brigada)

Browse Source 
* gtk/gtktextlayout.c (set_para_values):
	* gtk/gtkenums.h (GtkWrapMode): Add GTK_WRAP_WORD_CHAR.  (#110086,
	David Brigada)
This commit is contained in:
Matthias Clasen
2003-04-07 18:19:46 +00:00
parent c4dd1bd3f9
commit 0230821081
9 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* 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/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c,
gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous
misspellings of possessive "its". (#110027, Doug Quale) misspellings of possessive "its". (#110027, Doug Quale)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* 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/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c,
gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous
misspellings of possessive "its". (#110027, Doug Quale) misspellings of possessive "its". (#110027, Doug Quale)

4
ChangeLog.pre-2-4
View File

@ -1,5 +1,9 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* 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/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c,
gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous
misspellings of possessive "its". (#110027, Doug Quale) misspellings of possessive "its". (#110027, Doug Quale)

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* 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/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c,
gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous
misspellings of possessive "its". (#110027, Doug Quale) misspellings of possessive "its". (#110027, Doug Quale)

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* 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/gtkcelleditable.c, gtk/gtkfixed.c, gtk/gtktreemodel.c,
gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous gtk/gtktreeselection.c, gtk/gtktreeview.c: Fix numerous
misspellings of possessive "its". (#110027, Doug Quale) misspellings of possessive "its". (#110027, Doug Quale)

2
docs/reference/ChangeLog
View File

@ -1,5 +1,7 @@
2003-04-07 Matthias Clasen <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtktexttag.sgml: Document GTK_WRAP_WORD_CHAR. (#110086)
* gtk/tmpl/gtkenums.sgml, gtk/tmpl/gtkmain.sgml, * gtk/tmpl/gtkenums.sgml, gtk/tmpl/gtkmain.sgml,
gtk/tmpl/gtkpaned.sgml, gtk/tmpl/gtkradiobutton.sgml, gtk/tmpl/gtkpaned.sgml, gtk/tmpl/gtkradiobutton.sgml,
gtk/tmpl/gtkspinbutton.sgml, gtk/tmpl/gtkstatusbar.sgml, gtk/tmpl/gtkspinbutton.sgml, gtk/tmpl/gtkstatusbar.sgml,

2
docs/reference/gtk/tmpl/gtktexttag.sgml
View File

@ -49,6 +49,8 @@ Describes a type of line wrapping.
be technical, between graphemes, see be technical, between graphemes, see
pango_get_log_attrs()) pango_get_log_attrs())
@GTK_WRAP_WORD: wrap text, breaking lines in between words @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.
<!-- ##### STRUCT GtkTextAttributes ##### --> <!-- ##### STRUCT GtkTextAttributes ##### -->
<para> <para>

3
gtk/gtkenums.h
View File

@ -416,7 +416,8 @@ typedef enum
{ {
GTK_WRAP_NONE, GTK_WRAP_NONE,
GTK_WRAP_CHAR, GTK_WRAP_CHAR,
GTK_WRAP_WORD GTK_WRAP_WORD,
GTK_WRAP_WORD_CHAR
} GtkWrapMode; } GtkWrapMode;
/* How to sort */ /* How to sort */

6
gtk/gtktextlayout.c
View File

@ -1156,6 +1156,12 @@ set_para_values (GtkTextLayout *layout,
pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD); pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD);
break; 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: case GTK_WRAP_NONE:
break; break;
} }