Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build against pango main

Browse Source 
Handle (and ignore) new Pango attributes.
This commit is contained in:
Matthias Clasen
2021-09-02 19:02:54 -04:00
parent 4f5d959a94
commit 5053e9917e
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/gtk-demo/fontify.c
View File

@@ -271,6 +271,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
#if PANGO_VERSION_CHECK(1,49,0)
case PANGO_ATTR_TEXT_TRANSFORM:
#endif
#if PANGO_VERSION_CHECK(1,49,1)
case PANGO_ATTR_WORD:
case PANGO_ATTR_SENTENCE:
case PANGO_ATTR_BASELINE_SHIFT:
case PANGO_ATTR_FONT_SCALE:
break;
#endif

6
gtk/gtkpango.c
View File

@@ -262,6 +262,12 @@ attribute_from_text (GtkBuilder *builder,
if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_TEXT_TRANSFORM, value, &val, error))
attribute = pango_attr_text_transform_new (g_value_get_enum (&val));
break;
#endif
#if PANGO_VERSION_CHECK(1, 49, 1)
case PANGO_ATTR_WORD:
case PANGO_ATTR_SENTENCE:
case PANGO_ATTR_BASELINE_SHIFT:
case PANGO_ATTR_FONT_SCALE:
#endif
case PANGO_ATTR_INVALID:
default:

6
gtk/gtktextbuffer.c
View File

@@ -4713,6 +4713,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_TEXT_TRANSFORM:
#endif
#if PANGO_VERSION_CHECK(1, 49, 1)
case PANGO_ATTR_WORD:
case PANGO_ATTR_SENTENCE:
case PANGO_ATTR_BASELINE_SHIFT:
case PANGO_ATTR_FONT_SCALE:
break;
#endif

4
testsuite/gtk/label.c
View File

@@ -44,6 +44,10 @@ print_attribute (PangoAttribute *attr, GString *string)
#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
case PANGO_ATTR_TEXT_TRANSFORM:
case PANGO_ATTR_WORD:
case PANGO_ATTR_SENTENCE:
case PANGO_ATTR_BASELINE_SHIFT:
case PANGO_ATTR_FONT_SCALE:
#endif
g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
break;