AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Handle new pango attribute type

See merge request GNOME/gtk!3866
This commit is contained in:
Matthias Clasen 2021-08-22 15:22:14 +00:00
commit 210a709246
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,11 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
case PANGO_ATTR_BACKGROUND_ALPHA: case PANGO_ATTR_BACKGROUND_ALPHA:
break; break;
#if PANGO_VERSION_CHECK(1,49,0)
case PANGO_ATTR_TEXT_TRANSFORM:
break;
#endif
case PANGO_ATTR_INVALID: case PANGO_ATTR_INVALID:
default: default:
g_assert_not_reached (); g_assert_not_reached ();

4
gtk/gtkpango.c
View File

@ -258,6 +258,10 @@ attribute_from_text (GtkBuilder *builder,
if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error)) if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
attribute = pango_attr_line_height_new_absolute (g_value_get_int (&val) * PANGO_SCALE); attribute = pango_attr_line_height_new_absolute (g_value_get_int (&val) * PANGO_SCALE);
break; break;
case PANGO_ATTR_TEXT_TRANSFORM:
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 #endif
case PANGO_ATTR_INVALID: case PANGO_ATTR_INVALID:
default: default:

5
gtk/gtktextbuffer.c
View File

@ -4711,6 +4711,11 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
INT_ATTR (insert_hyphens); INT_ATTR (insert_hyphens);
break; break;
#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_TEXT_TRANSFORM:
break;
#endif
case PANGO_ATTR_SHAPE: case PANGO_ATTR_SHAPE:
case PANGO_ATTR_ABSOLUTE_SIZE: case PANGO_ATTR_ABSOLUTE_SIZE:
case PANGO_ATTR_GRAVITY: case PANGO_ATTR_GRAVITY:

1
testsuite/gtk/label.c
View File

@ -43,6 +43,7 @@ print_attribute (PangoAttribute *attr, GString *string)
case PANGO_ATTR_SHOW: case PANGO_ATTR_SHOW:
#if PANGO_VERSION_CHECK(1, 49, 0) #if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT: case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
case PANGO_ATTR_TEXT_TRANSFORM:
#endif #endif
g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value); g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
break; break;