From f647abca429fb9ea08d50f8282471a8a694a6c18 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Thu, 9 Feb 2023 22:02:18 +0100 Subject: [PATCH] feat: adjusted windows centering (update and setup window) --- Stats/Views/Setup.swift | 9 ++++++++- Stats/Views/Update.swift | 15 ++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Stats/Views/Setup.swift b/Stats/Views/Setup.swift index 9e2b8867..d5c94e18 100644 --- a/Stats/Views/Setup.swift +++ b/Stats/Views/Setup.swift @@ -41,7 +41,7 @@ internal class SetupWindow: NSWindow, NSWindowDelegate { self.delegate = self self.title = localizedString("Stats Setup") - self.center() + self.positionCenter() self.setIsVisible(false) let windowController = NSWindowController() @@ -60,6 +60,13 @@ internal class SetupWindow: NSWindow, NSWindowDelegate { func windowWillClose(_ notification: Notification) { self.finishHandler() } + + private func positionCenter() { + self.setFrameOrigin(NSPoint( + x: (NSScreen.main!.frame.width - self.view.frame.width)/2, + y: (NSScreen.main!.frame.height - self.view.frame.height)/2 + )) + } } private class SetupContainer: NSStackView { diff --git a/Stats/Views/Update.swift b/Stats/Views/Update.swift index 88226b7b..adbeb190 100644 --- a/Stats/Views/Update.swift +++ b/Stats/Views/Update.swift @@ -16,12 +16,10 @@ class UpdateWindow: NSWindow, NSWindowDelegate { private let viewController: UpdateViewController = UpdateViewController() init() { - let w = NSScreen.main!.frame.width - let h = NSScreen.main!.frame.height super.init( contentRect: NSRect( - x: w - self.viewController.view.frame.width, - y: h - self.viewController.view.frame.height, + x: NSScreen.main!.frame.width - self.viewController.view.frame.width, + y: NSScreen.main!.frame.height - self.viewController.view.frame.height, width: self.viewController.view.frame.width, height: self.viewController.view.frame.height ), @@ -33,7 +31,7 @@ class UpdateWindow: NSWindow, NSWindowDelegate { self.title = "Stats" self.contentViewController = self.viewController self.titlebarAppearsTransparent = true - self.center() + self.positionCenter() self.setIsVisible(false) let windowController = NSWindowController() @@ -48,6 +46,13 @@ class UpdateWindow: NSWindow, NSWindowDelegate { } self.viewController.open(v) } + + private func positionCenter() { + self.setFrameOrigin(NSPoint( + x: (NSScreen.main!.frame.width - self.viewController.view.frame.width)/2, + y: (NSScreen.main!.frame.height - self.viewController.view.frame.height)/2 + )) + } } private class UpdateViewController: NSViewController {