Kaydet (Commit) 753f5721 authored tarafından Khaled Hosny's avatar Khaled Hosny

Fix fdo#64972 - strikethrough displays too high

I was calculating the leading before setting the ascent and descent,
oops.

Change-Id: Ic58ecb1a65cb33715ea06f5e3214c4acbcff1e40
üst 88b8bd64
...@@ -940,7 +940,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const ...@@ -940,7 +940,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
rTo.mnDescent = 0; rTo.mnDescent = 0;
rTo.mnExtLeading = 0; rTo.mnExtLeading = 0;
rTo.mnSlant = 0; rTo.mnSlant = 0;
rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6);
rTo.mnWidth = mnWidth; rTo.mnWidth = mnWidth;
// Calculating ascender and descender: // Calculating ascender and descender:
...@@ -994,6 +993,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const ...@@ -994,6 +993,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
} }
} }
rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6);
if( pOS2 && (pOS2->version != 0xFFFF) ) if( pOS2 && (pOS2->version != 0xFFFF) )
{ {
// map the panose info from the OS2 table to their VCL counterparts // map the panose info from the OS2 table to their VCL counterparts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment