From 23b5428383ed93b8793bdae3099ceb885a7f756f Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 9 Sep 2022 23:19:25 +0800 Subject: [PATCH] ctlTooltip // Disable vertical display on macOS 10.11 and 10.12. - These versions of macOS don't draw NSAttributedStrings well. --- .../ControllerModules/ctlInputMethod_HandleDisplay.swift | 2 +- Source/Modules/UIModules/TooltipUI/ctlTooltip.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift b/Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift index 40e49585..3f50bba0 100644 --- a/Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift +++ b/Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift @@ -33,7 +33,7 @@ extension ctlInputMethod { x: lineHeightRect.origin.x + lineHeightRect.size.width + 5, y: lineHeightRect.origin.y ) } - var tooltipContentDirection: NSAttributedTextView.writingDirection = { + let tooltipContentDirection: NSAttributedTextView.writingDirection = { if mgrPrefs.alwaysShowTooltipTextsHorizontally { return .horizontal } return isVerticalTyping ? .vertical : .horizontal }() diff --git a/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift b/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift index 6adbee54..cd8fb857 100644 --- a/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift +++ b/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift @@ -28,6 +28,7 @@ public class ctlTooltip: NSWindowController { public var direction: NSAttributedTextView.writingDirection = .horizontal { didSet { + if #unavailable(macOS 10.13) { direction = .horizontal } messageText.direction = direction } } @@ -59,7 +60,6 @@ public class ctlTooltip: NSWindowController { direction: NSAttributedTextView.writingDirection = .horizontal ) { self.direction = direction - messageText.direction = self.direction self.tooltip = tooltip window?.orderFront(nil) set(windowTopLeftPoint: point, bottomOutOfScreenAdjustmentHeight: heightDelta)