Align Itembox Labels With Text

Author: thecoolwinter

Sources/CodeEditSourceEditor/CodeSuggestion/TableView/CodeSuggestionLabelView.swift

@@ -9,6 +9,8 @@ import AppKit
 import SwiftUI
 
 struct CodeSuggestionLabelView: View {
+    static let HORIZONTAL_PADDING: CGFloat = 13
+
     let suggestion: CodeSuggestionEntry
     let labelColor: NSColor
     let secondaryLabelColor: NSColor
@@ -45,7 +47,7 @@ struct CodeSuggestionLabelView: View {
             }
         }
         .padding(.vertical, 3)
-        .padding(.horizontal, 13)
+        .padding(.horizontal, Self.HORIZONTAL_PADDING)
         .buttonStyle(PlainButtonStyle())
     }
 }

Sources/CodeEditSourceEditor/CodeSuggestion/Window/SuggestionController+Window.swift

@@ -9,7 +9,7 @@ import AppKit
 
 extension SuggestionController {
     /// Will constrain the window's frame to be within the visible screen
-    public func constrainWindowToScreenEdges(cursorRect: NSRect) {
+    public func constrainWindowToScreenEdges(cursorRect: NSRect, font: NSFont) {
         guard let window = self.window,
               let screenFrame = window.screen?.visibleFrame else {
             return
@@ -18,7 +18,8 @@ extension SuggestionController {
         let windowSize = window.frame.size
         let padding: CGFloat = 22
         var newWindowOrigin = NSPoint(
-            x: cursorRect.origin.x - Self.WINDOW_PADDING,
+            x: cursorRect.origin.x - Self.WINDOW_PADDING
+            - CodeSuggestionLabelView.HORIZONTAL_PADDING - font.pointSize,
             y: cursorRect.origin.y
         )
 

Sources/CodeEditSourceEditor/CodeSuggestion/Window/SuggestionController.swift

@@ -91,7 +91,7 @@ public final class SuggestionController: NSWindowController {
                 self.popover = popover
             } else {
                 self.showWindow(attachedTo: parentWindow)
-                self.constrainWindowToScreenEdges(cursorRect: cursorRect)
+                self.constrainWindowToScreenEdges(cursorRect: cursorRect, font: textView.font)
 
                 if let controller = self.contentViewController as? SuggestionViewController {
                     controller.styleView(using: textView)