Skip to content

Commit 91752fa

Browse files
committed
Remove invocation of convienence scrollview factory method, is more opaque and hides configs that are immediately overridden.
1 parent 30dfff3 commit 91752fa

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Sources/CodeEditTextView/STTextViewController.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,19 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
8383
// MARK: VC Lifecycle
8484

8585
public override func loadView() {
86-
let scrollView = STTextView.scrollableTextView()
87-
textView = scrollView.documentView as? STTextView
88-
89-
// By default this is always null but is required for a couple operations
90-
// during highlighting so we make a new one manually.
91-
// textView.textContainer.replaceLayoutManager(NSLayoutManager())
92-
86+
textView = STTextView()
87+
88+
let scrollView = NSScrollView()
9389
scrollView.translatesAutoresizingMaskIntoConstraints = false
9490
scrollView.hasVerticalScroller = true
91+
scrollView.documentView = textView
9592

9693
rulerView = STLineNumberRulerView(textView: textView, scrollView: scrollView)
9794
rulerView.backgroundColor = theme.background
9895
rulerView.textColor = .systemGray
9996
rulerView.drawSeparator = false
10097
rulerView.baselineOffset = baselineOffset
101-
rulerView.font = NSFont.monospacedDigitSystemFont(ofSize: 9.5, weight: .regular)
98+
rulerView.font = NSFont(descriptor: NSFont.monospacedDigitSystemFont(ofSize: 11, weight: .regular).fontDescriptor, textTransform: AffineTransform(scaleByX: 1, byY: 1.1)) ?? .monospacedDigitSystemFont(ofSize: 11, weight: .regular)
10299

103100
scrollView.verticalRulerView = rulerView
104101
scrollView.rulersVisible = true
@@ -112,7 +109,7 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
112109
textView.selectionBackgroundColor = theme.selection
113110
textView.selectedLineHighlightColor = theme.lineHighlight
114111
textView.string = self.text.wrappedValue
115-
textView.widthTracksTextView = true
112+
textView.widthTracksTextView = self.wrapLines
116113
textView.highlightSelectedLine = true
117114
textView.allowsUndo = true
118115
textView.setupMenus()

0 commit comments

Comments
 (0)