Fix name height mis calculation

inline-chat · Dec 29, 2024 · be10d79 · be10d79
1 parent 5fed924
commit be10d79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apple/InlineMac/Utils/Theme.swift b/apple/InlineMac/Utils/Theme.swift
@@ -34,7 +34,7 @@ enum Theme {
 //  Space between avatar and content
   static let messageHorizontalStackSpacing: CGFloat = 8
   static let messageVerticalStackSpacing: CGFloat = 2.0
-  static let messageNameLabelHeight: CGFloat = 16
+  static let messageNameLabelHeight: CGFloat = 14
   static let messageTextFont: NSFont = .systemFont(ofSize: NSFont.systemFontSize)
   static let messageTextLineFragmentPadding: CGFloat = 0
   static let messageTextContainerInset: NSSize = .zero

diff --git a/apple/InlineMac/Views/Chat/Message/MessageViewAppKit.swift b/apple/InlineMac/Views/Chat/Message/MessageViewAppKit.swift
@@ -258,7 +258,7 @@ class MessageViewAppKit: NSView {
     let avatarLeading = Theme.messageSidePadding
     let contentLeading = avatarLeading + Self.avatarSize + Theme.messageHorizontalStackSpacing - bgPadding
     let sidePadding = Theme.messageSidePadding - bgPadding
-    let senderNameLeadingPadding = hasBubble ? 4.0 : 0.0
+    let senderNameLeadingPadding = hasBubble ? 6.0 : 0.0
 
     if props.firstInGroup {
       topPadding += Theme.messageGroupSpacing
@@ -277,7 +277,9 @@ class MessageViewAppKit: NSView {
       NSLayoutConstraint.activate([
         nameLabel.leadingAnchor.constraint(equalTo: leadingAnchor, constant: contentLeading + senderNameLeadingPadding),
         nameLabel.topAnchor.constraint(equalTo: topAnchor, constant: topPadding),
-        nameLabel.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor, constant: -sidePadding)
+        nameLabel.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor, constant: -sidePadding),
+        nameLabel.heightAnchor
+          .constraint(equalToConstant: Theme.messageNameLabelHeight),
       ])
     }