From 4de0229dc0439c096d8caab8dd19181b1b0fb30f Mon Sep 17 00:00:00 2001 From: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:24:10 -0500 Subject: [PATCH] Set default ruler width --- Package.resolved | 14 +++++++------- .../Controller/STTextViewController.swift | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index c959a67c5..44de3fef7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/CodeEditApp/CodeEditLanguages.git", "state" : { - "revision" : "016b0e8df9603122202aef1f17cdc7fb2b51e1d0", - "version" : "0.1.14" + "revision" : "aa7d922b2aa783ae6f2a1a2cb7010ae62b700e17", + "version" : "0.1.16" } }, { @@ -21,10 +21,10 @@ { "identity" : "sttextview", "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/STTextView", + "location" : "https://github.com/krzyzanowskim/STTextView.git", "state" : { - "revision" : "6c6243ae790247368aea258e4fb3642523759bec", - "version" : "0.5.3" + "branch" : "897c5ff", + "revision" : "897c5ffe3c6b35664ab085d43238b3a95e79440d" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/ChimeHQ/TextFormation", "state" : { - "revision" : "78d0911ef1827957c836f312212cc111b9232046", - "version" : "0.6.7" + "revision" : "158a603054ed5176f18d7c08ba355c0e05cb0586", + "version" : "0.7.0" } }, { diff --git a/Sources/CodeEditTextView/Controller/STTextViewController.swift b/Sources/CodeEditTextView/Controller/STTextViewController.swift index 446185d0a..5d9c4350e 100644 --- a/Sources/CodeEditTextView/Controller/STTextViewController.swift +++ b/Sources/CodeEditTextView/Controller/STTextViewController.swift @@ -207,9 +207,15 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt : NSColor.selectedTextBackgroundColor.withSystemEffect(.disabled) rulerView.baselineOffset = baselineOffset rulerView.highlightSelectedLine = isEditable - rulerView.rulerInsets = STRulerInsets(leading: rulerFont.pointSize * 1.6, trailing: 8) + rulerView.rulerInsets = STRulerInsets(leading: 12, trailing: 8) rulerView.font = rulerFont rulerView.backgroundColor = theme.background + rulerView.ruleThickness = max( + NSString(string: "1000").size(withAttributes: [.font: rulerFont]).width + + rulerView.rulerInsets.leading + + rulerView.rulerInsets.trailing, + rulerView.ruleThickness + ) if self.isEditable == false { rulerView.selectedLineTextColor = nil rulerView.selectedLineHighlightColor = .clear