microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 13:56:33 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

AtlasEngine: Partially revert glyph scaling changes (#14085)

Browse Source 
This change fixes issues with certain fonts that draw _way_ outside the advance
width/height black box and expect to remain centered on the baseline.

## Validation Steps Performed
* Use MesloLGM Nerd Font
* Print U+E0B0
* Ensure it's centered, even if it's cut off ✅
This commit is contained in:
Leonard Hecker 2022-09-27 20:59:13 +02:00 committed by GitHub
parent c392ade6dd
commit 2de475b36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/atlas/AtlasEngine.r.cpp
View File

@ -550,10 +550,12 @@ AtlasEngine::CachedGlyphLayout AtlasEngine::_getCachedGlyphLayout(const wchar_t*
static_cast<f32>(glyphMetrics.advanceHeight) / static_cast<f32>(metrics.designUnitsPerEm) * _r.fontMetrics.fontSizeInDIP, static_cast<f32>(glyphMetrics.advanceHeight) / static_cast<f32>(metrics.designUnitsPerEm) * _r.fontMetrics.fontSizeInDIP,
}; };
// NOTE: Don't adjust the offset.
// Despite these being block characters, some fonts position them really weird with glyphs hanging out
// on all sides by up to 0.2em. They still expect the glyphs to be drawn on to their regular baseline.
// At the time of writing this can be tested with MesloLGM Nerd Font and U+E0B0 for instance.
scalingRequired = true; scalingRequired = true;
// We always want box drawing glyphs to be centered in their cell.
offset.x = (layoutBox.x - boxSize.x) * 0.5f;
offset.y = (layoutBox.y - boxSize.y) * 0.5f;
// We always want box drawing glyphs to exactly match the size of a terminal cell. // We always want box drawing glyphs to exactly match the size of a terminal cell.
// But add 1px to the destination size, so that we don't end up with fractional pixels. // But add 1px to the destination size, so that we don't end up with fractional pixels.
scale.x = (layoutBox.x + _r.dipPerPixel) / boxSize.x; scale.x = (layoutBox.x + _r.dipPerPixel) / boxSize.x;