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

Merge branch 'big-glyph-test' into 'main'

Browse Source 
gsk: Fix big glyphs getting clipped

See merge request GNOME/gtk!6744
This commit is contained in:
Matthias Clasen
2024-01-12 21:31:35 +00:00
parent c1407f2ca6 9f4f65be4a
commit c146f225ff
6 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gsk/gpu/gskgpudevice.c
View File

@@ -709,8 +709,8 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice *self,
.height = rect.size.height + 2 * padding,
},
scale,
&GRAPHENE_POINT_INIT (cache->origin.x + 1,
cache->origin.y + 1));
&GRAPHENE_POINT_INIT (cache->origin.x + padding,
cache->origin.y + padding));
g_hash_table_insert (priv->glyph_cache, cache, cache);
gsk_gpu_cached_use (self, (GskGpuCached *) cache, gsk_gpu_frame_get_timestamp (frame));

7
testsuite/gsk/compare/big-box-glyph-nocairo.node Normal file
View File

@@ -0,0 +1,7 @@
transform {
transform: scale(30);
child: text {
font: "text-mixed-color 7.5";
glyphs: 7 10;
}
}

BIN
testsuite/gsk/compare/big-box-glyph-nocairo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
testsuite/gsk/fonts/text-mixed-color.ttf
View File

Binary file not shown.

18
testsuite/gsk/fonts/text-mixed-color.ttx
View File

@@ -10,6 +10,7 @@
<GlyphID id="4" name="D"/>
<GlyphID id="5" name="E"/>
<GlyphID id="6" name="F"/>
<GlyphID id="7" name="G"/>
</GlyphOrder>
<head>
@@ -80,6 +81,7 @@
<mtx name="D" width="1024" lsb="0"/>
<mtx name="E" width="1024" lsb="0"/>
<mtx name="F" width="1024" lsb="0"/>
<mtx name="G" width="1024" lsb="0"/>
</hmtx>
<loca>
@@ -141,6 +143,21 @@
</contour>
<instructions><assembly></assembly></instructions>
</TTGlyph>
<TTGlyph name="G">
<contour>
<pt x="0" y="0" on="1"/>
<pt x="1024" y="0" on="1"/>
<pt x="1024" y="2048" on="1"/>
<pt x="0" y="2048" on="1"/>
</contour>
<contour>
<pt x="5" y="5" on="1"/>
<pt x="5" y="2043" on="1"/>
<pt x="1019" y="2043" on="1"/>
<pt x="1019" y="5" on="1"/>
</contour>
<instructions><assembly></assembly></instructions>
</TTGlyph>
</glyf>
<COLR>
@@ -182,6 +199,7 @@
<map code="0x44" name="D"/>
<map code="0x45" name="E"/>
<map code="0x46" name="F"/>
<map code="0x47" name="G"/>
</cmap_format_4>
</cmap>

1
testsuite/gsk/meson.build
View File

@@ -10,6 +10,7 @@ node_parser = executable('node-parser', 'node-parser.c',
)
compare_render_tests = [
'big-box-glyph-nocairo',
'big-checkerboard',
'big-checkerboard-scaled-down',
'big-checkerboard-scaled-down-nearest',