From 77e73ee4a1bb989830ade6c2d5f0d817b99fe79d Mon Sep 17 00:00:00 2001 From: Kai Azim <68963405+MrKai77@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:59:59 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Make=20preview=20window=20not=20?= =?UTF-8?q?show=20over=20the=20dock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Loop/Helpers/LoopManager.swift | 2 +- Loop/Preview Window/PreviewController.swift | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Loop/Helpers/LoopManager.swift b/Loop/Helpers/LoopManager.swift index e13a9376..5c8eed0b 100644 --- a/Loop/Helpers/LoopManager.swift +++ b/Loop/Helpers/LoopManager.swift @@ -86,7 +86,7 @@ class LoopManager { self.screenWithMouse = NSScreen.screenWithMouse if Defaults[.previewVisibility] == true && frontmostWindow != nil { - previewController.show() + previewController.show(screen: self.screenWithMouse!) } radialMenuController.show(frontmostWindow: frontmostWindow) keybindMonitor.start() diff --git a/Loop/Preview Window/PreviewController.swift b/Loop/Preview Window/PreviewController.swift index 98d142c1..46220b4d 100644 --- a/Loop/Preview Window/PreviewController.swift +++ b/Loop/Preview Window/PreviewController.swift @@ -11,7 +11,7 @@ class PreviewController { var loopPreviewWindowController: NSWindowController? - func show() { + func show(screen: NSScreen) { if let windowController = loopPreviewWindowController { windowController.window?.orderFrontRegardless() return @@ -30,18 +30,7 @@ class PreviewController { panel.alphaValue = 0 panel.orderFrontRegardless() - guard let screen = NSScreen.screenWithMouse else { return } - let menubarHeight = screen.frame.size.height - screen.visibleFrame.size.height - - let screenWidth = screen.frame.size.width - let screenHeight = screen.frame.size.height - menubarHeight - let screenOriginX = screen.frame.origin.x - let screenOriginY = screen.frame.origin.y - - panel.setFrame(NSRect(x: screenOriginX, - y: screenOriginY, - width: screenWidth, - height: screenHeight), display: false) + panel.setFrame(screen.visibleFrame, display: false) loopPreviewWindowController = .init(window: panel)