From 5241f936c04c5f85d03c827b0b83faa28312b433 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 24 Dec 2017 10:28:34 -0800 Subject: [PATCH 1/2] Use setPointAndSizeAdjustingForScreen for setting size and position of main window on first run. --- Evergreen/MainWindow/MainWindowController.swift | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index 67101e0f8..23abc1e58 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -38,15 +38,11 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { window?.setFrameUsingName(windowAutosaveName, force: true) if AppDefaults.shared.isFirstRun && !MainWindowController.didPositionWindowOnFirstRun { - if let window = window, let screen = window.screen { - let width: CGFloat = 1280.0 - let height: CGFloat = 768.0 - let insetX: CGFloat = 192.0 - let insetY: CGFloat = 96.0 - - window.setContentSize(NSSize(width: width, height: height)) - window.setFrameTopLeftPoint(NSPoint(x: insetX, y: screen.visibleFrame.maxY - insetY)) - + if let window = window { + let point = NSPoint(x: 128, y: 64) + let size = NSSize(width: 1000, height: 700) + let minSize = NSSize(width: 600, height: 600) + window.setPointAndSizeAdjustingForScreen(point: point, size: size, minimumSize: minSize) MainWindowController.didPositionWindowOnFirstRun = true } } From 28eccbcc6aa131ddc05a732f2ff93341e4037714 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 24 Dec 2017 10:39:50 -0800 Subject: [PATCH 2/2] =?UTF-8?q?Set=20the=20Mark=20as=20Starred=20action=20?= =?UTF-8?q?to=20nil,=20since=20there=E2=80=99s=20no=20implementation=20yet?= =?UTF-8?q?.=20Fix=20#270.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Evergreen/Base.lproj/Main.storyboard | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Evergreen/Base.lproj/Main.storyboard b/Evergreen/Base.lproj/Main.storyboard index 11343aea1..4a46a1a91 100644 --- a/Evergreen/Base.lproj/Main.storyboard +++ b/Evergreen/Base.lproj/Main.storyboard @@ -405,11 +405,7 @@ - - - - - +