Fixed issue with emoji pop-up odd colors #619

tigase · Jun 29, 2024 · 37d445e · 37d445e
1 parent e980521
commit 37d445e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/BeagleIM/conversation/AbstractChatViewController.swift b/BeagleIM/conversation/AbstractChatViewController.swift
@@ -487,12 +487,20 @@ class EmojiShortcodeSuggestionItemView: SuggestionItemViewBase<String> {
 
     required init() {
         emoji = NSTextField(labelWithString: "");
+        emoji.drawsBackground = false;
+        emoji.isEditable = false
+        emoji.isSelectable = false
+        emoji.isBezeled = false;
         emoji.cell?.truncatesLastVisibleLine = false;
         emoji.cell?.lineBreakMode = .byWordWrapping;
         emoji.cell?.alignment = .center;
         emoji.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal);
 
         label = NSTextField(labelWithString: "");
+        label.drawsBackground = false;
+        label.isEditable = false
+        label.isSelectable = false
+        label.isBezeled = false;
         label.font = NSFont.systemFont(ofSize: NSFont.systemFontSize - 1, weight: .medium);
         label.cell?.truncatesLastVisibleLine = true;
         label.cell?.lineBreakMode = .byTruncatingTail;
@@ -574,9 +582,17 @@ class EmojiFaceSuggestionItemView: SuggestionItemViewBase<EmojiFace> {
         emoji.cell?.truncatesLastVisibleLine = false;
         emoji.cell?.lineBreakMode = .byWordWrapping;
         emoji.cell?.alignment = .center;
+        emoji.drawsBackground = false;
+        emoji.isEditable = false
+        emoji.isSelectable = false
+        emoji.isBezeled = false;
         emoji.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal);
 
         label = NSTextField(labelWithString: "");
+        label.drawsBackground = false;
+        label.isEditable = false
+        label.isSelectable = false
+        label.isBezeled = false;
         label.font = NSFont.systemFont(ofSize: NSFont.systemFontSize - 1, weight: .medium);
         label.cell?.truncatesLastVisibleLine = true;
         label.cell?.lineBreakMode = .byTruncatingTail;

diff --git a/BeagleIM/ui/suggestions/SuggestionsHighlightingView.swift b/BeagleIM/ui/suggestions/SuggestionsHighlightingView.swift
@@ -36,10 +36,10 @@ class SuggestionsHighlightingView: NSView {
     override func draw(_ dirtyRect: NSRect) {
         if isHighlighted {
             NSColor.alternateSelectedControlColor.set()
-            __NSRectFillUsingOperation(dirtyRect, .sourceOver)
+            __NSRectFillUsingOperation(bounds, .sourceOver)
         } else {
             NSColor.clear.set()
-            __NSRectFillUsingOperation(dirtyRect, .sourceOver)
+            __NSRectFillUsingOperation(bounds, .sourceOver)
         }
      //   super.draw(dirtyRect);
     }