From 1909e85a0236fd22ec156fd8090fe0b06a61bea9 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Thu, 15 Sep 2022 11:17:07 +0800 Subject: [PATCH] Voltaire & Tooltip & PCB, etc. // Fix NSWindow positioning. --- Source/Modules/UIModules/CandidateUI/ctlCandidate.swift | 2 +- Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift | 2 +- .../PopupCompositionBufferUI/ctlPopupCompositionBuffer.swift | 2 +- Source/Modules/UIModules/TooltipUI/ctlTooltip.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift b/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift index 73d81745..06a68973 100644 --- a/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift +++ b/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift @@ -161,7 +161,7 @@ public class ctlCandidate: NSWindowController, ctlCandidateProtocol { var adjustedPoint = windowTopLeftPoint var delta = heightDelta var screenFrame = NSScreen.main?.visibleFrame ?? NSRect.seniorTheBeast - for frame in NSScreen.screens.map(\.visibleFrame).filter({ !$0.contains(windowTopLeftPoint) }) { + for frame in NSScreen.screens.map(\.visibleFrame).filter({ $0.contains(windowTopLeftPoint) }) { screenFrame = frame break } diff --git a/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift b/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift index 3e5a0cb9..4189f7a8 100644 --- a/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift +++ b/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift @@ -168,7 +168,7 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol { let windowSize = candidateFrame().size var delta = heightDelta var screenFrame = NSScreen.main?.visibleFrame ?? NSRect.seniorTheBeast - for frame in NSScreen.screens.map(\.visibleFrame).filter({ !$0.contains(windowTopLeftPoint) }) { + for frame in NSScreen.screens.map(\.visibleFrame).filter({ $0.contains(windowTopLeftPoint) }) { screenFrame = frame break } diff --git a/Source/Modules/UIModules/PopupCompositionBufferUI/ctlPopupCompositionBuffer.swift b/Source/Modules/UIModules/PopupCompositionBufferUI/ctlPopupCompositionBuffer.swift index a63bef92..c1f6444f 100644 --- a/Source/Modules/UIModules/PopupCompositionBufferUI/ctlPopupCompositionBuffer.swift +++ b/Source/Modules/UIModules/PopupCompositionBufferUI/ctlPopupCompositionBuffer.swift @@ -146,7 +146,7 @@ public class ctlPopupCompositionBuffer: NSWindowController { var adjustedPoint = windowOrigin var screenFrame = NSScreen.main?.visibleFrame ?? NSRect.seniorTheBeast - for frame in NSScreen.screens.map(\.visibleFrame).filter({ !$0.contains(windowOrigin) }) { + for frame in NSScreen.screens.map(\.visibleFrame).filter({ $0.contains(windowOrigin) }) { screenFrame = frame break } diff --git a/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift b/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift index bf5236ed..dc5e6f01 100644 --- a/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift +++ b/Source/Modules/UIModules/TooltipUI/ctlTooltip.swift @@ -130,7 +130,7 @@ public class ctlTooltip: NSWindowController { var adjustedPoint = windowTopLeftPoint var delta = heightDelta var screenFrame = NSScreen.main?.visibleFrame ?? NSRect.seniorTheBeast - for frame in NSScreen.screens.map(\.visibleFrame).filter({ !$0.contains(windowTopLeftPoint) }) { + for frame in NSScreen.screens.map(\.visibleFrame).filter({ $0.contains(windowTopLeftPoint) }) { screenFrame = frame break }