draw eval results at right edge of editor, always show line numbers
This commit is contained in:
parent
c4537b947e
commit
a72578cce8
|
|
@ -2008,14 +2008,15 @@ class LineNumberTextView: NSTextView {
|
||||||
let lineRect = lm.boundingRect(forGlyphRange: lineGlyphRange, in: tc)
|
let lineRect = lm.boundingRect(forGlyphRange: lineGlyphRange, in: tc)
|
||||||
let y = lineRect.origin.y + origin.y
|
let y = lineRect.origin.y + origin.y
|
||||||
|
|
||||||
|
let numStr = NSAttributedString(string: "\(lineNumber)", attributes: lineAttrs)
|
||||||
|
let numSize = numStr.size()
|
||||||
|
numStr.draw(at: NSPoint(x: LineNumberTextView.gutterWidth - numSize.width - 8, y: y))
|
||||||
|
|
||||||
if let result = evalResults[lineNumber - 1] {
|
if let result = evalResults[lineNumber - 1] {
|
||||||
let resultStr = NSAttributedString(string: "\u{2192} \(result)", attributes: resultAttrs)
|
let resultStr = NSAttributedString(string: "\u{2192} \(result)", attributes: resultAttrs)
|
||||||
let size = resultStr.size()
|
let size = resultStr.size()
|
||||||
resultStr.draw(at: NSPoint(x: LineNumberTextView.gutterWidth - size.width - 4, y: y))
|
let rightEdge = visibleRect.maxX
|
||||||
} else {
|
resultStr.draw(at: NSPoint(x: rightEdge - size.width - 8, y: y))
|
||||||
let numStr = NSAttributedString(string: "\(lineNumber)", attributes: lineAttrs)
|
|
||||||
let size = numStr.size()
|
|
||||||
numStr.draw(at: NSPoint(x: LineNumberTextView.gutterWidth - size.width - 8, y: y))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lineNumber += 1
|
lineNumber += 1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue