From 1889fe2604425368db046f1cb6e7360c24694e1a Mon Sep 17 00:00:00 2001 From: Carlos Enumo Date: Tue, 25 Jun 2024 13:33:51 +0100 Subject: [PATCH] Fix wrong popover position in fullscreen --- Calendr.xcodeproj/project.pbxproj | 4 ++-- Calendr/Components/Popover.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Calendr.xcodeproj/project.pbxproj b/Calendr.xcodeproj/project.pbxproj index fc12c53f..f9f6a340 100644 --- a/Calendr.xcodeproj/project.pbxproj +++ b/Calendr.xcodeproj/project.pbxproj @@ -1293,7 +1293,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.11.2; + MARKETING_VERSION = 1.11.3; PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h"; @@ -1319,7 +1319,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.11.2; + MARKETING_VERSION = 1.11.3; PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h"; diff --git a/Calendr/Components/Popover.swift b/Calendr/Components/Popover.swift index 0caaff95..8d12e0f3 100644 --- a/Calendr/Components/Popover.swift +++ b/Calendr/Components/Popover.swift @@ -185,7 +185,7 @@ private class PopoverWindow: NSWindow { private func relativePosition(to view: NSView, edge: NSRectEdge, spacing: CGFloat) -> NSPoint? { - guard let viewWindow = view.window, let screen = NSScreen.main else { + guard let viewWindow = view.window, let screen = viewWindow.screen else { return nil }