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

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

Browse Source 
rendernode: Fix handling of color glyphs

See merge request GNOME/gtk!6390
This commit is contained in:
Matthias Clasen
2023-09-13 20:14:41 +00:00
parent 408dd4b34d 1502c21e97
commit 9db2288064
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gskrendernodeparser.c
View File

@@ -3286,7 +3286,7 @@ gsk_text_node_serialize_glyphs (GskRenderNode *node,
string_append_double (p, (double) glyphs[i].geometry.y_offset / PANGO_SCALE);
if (!glyphs[i].attr.is_cluster_start)
g_string_append (p, " same-cluster");
if (!glyphs[i].attr.is_color)
if (glyphs[i].attr.is_color)
g_string_append (p, " color");
}

2
testsuite/gsk/meson.build
View File

@@ -328,6 +328,8 @@ node_parser_tests = [
'stroke.node',
'stroke.ref.node',
'testswitch.node',
'text-color.node',
'text-color.ref.node',
'text-fail.node',
'text-fail.ref.node',
'text-fail.errors',

5
testsuite/gsk/nodeparser/text-color.node Normal file
View File

@@ -0,0 +1,5 @@
text {
color: rgba(255,0,0,0.533333);
font: "Noto Sans 300";
glyphs: 50 312, 2712 0 -156 -28.7891 color;
}

5
testsuite/gsk/nodeparser/text-color.ref.node Normal file
View File

@@ -0,0 +1,5 @@
text {
color: rgba(255,0,0,0.533333);
font: "Noto Sans 300";
glyphs: 50 312, 2712 0 -156 -28.7891 color;
}