coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Change timing to cache replacement char width

Browse Source
This commit is contained in:
1024jp 2019-07-11 11:46:49 +09:00
parent 22ddfb7c8f
commit 253952cbbc
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -2,6 +2,15 @@
Change Log
==========================
3.7.9 (unreleased)
--------------------------
### Improvements
- Adjust drawing of the alternative character for invisible control characters.
3.7.8 (361)
--------------------------

20
CotEditor/Sources/LayoutManager.swift
View File

@ -59,21 +59,17 @@ final class LayoutManager: NSLayoutManager, ValidationIgnorable {
// -> DO NOT use `self.firstTextView.font`, because it may return another font in case for example:
// Japansete text is input nevertheless the font that user specified dosen't support it.
didSet {
guard let textFont = self.textFont else { return }
// cache metric values to fix line height
if let textFont = self.textFont {
self.defaultLineHeight = self.defaultLineHeight(for: textFont)
self.defaultBaselineOffset = self.defaultBaselineOffset(for: textFont)
// cache width of space char for hanging indent width calculation
self.spaceWidth = textFont.spaceWidth
// cache replacement glyph width for ATS Typesetter
let invisibleFont = NSFont(named: .lucidaGrande, size: textFont.pointSize) ?? textFont // use current text font for fallback
let replacementGlyph = invisibleFont.glyph(withName: "replacement") // U+FFFD
self.replacementGlyphWidth = invisibleFont.boundingRect(forGlyph: replacementGlyph).width
}
self.defaultLineHeight = self.defaultLineHeight(for: textFont)
self.defaultBaselineOffset = self.defaultBaselineOffset(for: textFont)
// cache width of space char for hanging indent width calculation
self.spaceWidth = textFont.spaceWidth
self.invisibleLines = self.generateInvisibleLines()
self.replacementGlyphWidth = self.invisibleLines.replacement.bounds().width
}
}