Splitting the ruler padding into leading and trailing padding (#10)

Signed-off-by: Elias Wahl <[email protected]>
krzyzanowskim · Jan 24, 2023 · deab1ae · deab1ae
1 parent 78f39b8
commit deab1ae
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/Sources/STTextView/STLineNumberRulerView.swift b/Sources/STTextView/STLineNumberRulerView.swift
@@ -17,10 +17,10 @@ open class STLineNumberRulerView: NSRulerView {
     @Invalidating(.display)
     open var font: NSFont = NSFont(descriptor: NSFont.monospacedDigitSystemFont(ofSize: NSFont.labelFontSize, weight: .regular).fontDescriptor.withSymbolicTraits(.condensed), size: NSFont.labelFontSize) ?? NSFont.monospacedSystemFont(ofSize: NSFont.labelFontSize, weight: .regular)
 
-    /// The horizontal padding of the ruler view.
+    /// The insets of the ruler view.
     @Invalidating(.display)
-    open var rulePadding: CGFloat = 6
-
+    open var rulerInsets: STRulerInsets = STRulerInsets(leading: 6.0, trailing: 6.0)
+    
     /// The text color of the line numbers.
     @Invalidating(.display)
     open var textColor: NSColor = .secondaryLabelColor
@@ -167,8 +167,8 @@ open class STLineNumberRulerView: NSRulerView {
         // Adjust ruleThickness based on last (longest) value
         if let lastLine = lines.last {
             let ctLineWidth = CTLineGetTypographicBounds(lastLine.ctLine, nil, nil, nil)
-            if ruleThickness < (ctLineWidth + (rulePadding * 2)) {
-                self.ruleThickness = max(self.ruleThickness, ctLineWidth + (self.rulePadding * 2))
+            if ruleThickness < (ctLineWidth + (rulerInsets.leading + rulerInsets.trailing)) {
+                self.ruleThickness = max(self.ruleThickness, ctLineWidth + (rulerInsets.leading + rulerInsets.trailing))
             }
         }
 
@@ -177,7 +177,7 @@ open class STLineNumberRulerView: NSRulerView {
             let ctLineWidth = ceil(CTLineGetTypographicBounds($0.ctLine, nil, nil, nil))
 
             return (
-                textPosition: $0.textPosition.moved(dx: ruleThickness - (ctLineWidth + rulePadding), dy: -baselineOffset),
+                textPosition: $0.textPosition.moved(dx: ruleThickness - (ctLineWidth + rulerInsets.trailing), dy: -baselineOffset),
                 ctLine: $0.ctLine
             )
         }

diff --git a/Sources/STTextView/Utility/STLineNumberTypes.swift b/Sources/STTextView/Utility/STLineNumberTypes.swift
@@ -0,0 +1,13 @@
+//  Created by Elias Wahl on 14.01.23.
+import Foundation
+
+public struct STRulerInsets: Equatable {
+    public let leading: CGFloat
+    public let trailing: CGFloat
+
+    public init(leading: CGFloat, trailing: CGFloat) {
+        self.leading = leading
+        self.trailing = trailing
+    }
+
+}