FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brentsimmons/Evergreen

This commit is contained in:
Brent Simmons 2017-12-24 11:00:33 -08:00
parent 9c599a6160 28eccbcc6a
commit f0e11ec0b8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Evergreen/Base.lproj/Main.storyboard
View File

@ -405,11 +405,7 @@
</connections> </connections>
</menuItem> </menuItem>
<menuItem isSeparatorItem="YES" id="gB0-WX-2Gd"/> <menuItem isSeparatorItem="YES" id="gB0-WX-2Gd"/>
<menuItem title="Mark as Starred" keyEquivalent="L" id="vvo-ZM-8kl"> <menuItem title="Mark as Starred" keyEquivalent="L" id="vvo-ZM-8kl"/>
<connections>
<action selector="markAllAsRead:" target="Ady-hI-5gd" id="WdN-5m-sV0"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="qgr-Gl-Xhw"/> <menuItem isSeparatorItem="YES" id="qgr-Gl-Xhw"/>
<menuItem title="Open in Browser" keyEquivalent="" id="4iQ-1v-dTa"> <menuItem title="Open in Browser" keyEquivalent="" id="4iQ-1v-dTa">
<connections> <connections>

14
Evergreen/MainWindow/MainWindowController.swift
View File

@ -38,15 +38,11 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
window?.setFrameUsingName(windowAutosaveName, force: true) window?.setFrameUsingName(windowAutosaveName, force: true)
if AppDefaults.shared.isFirstRun && !MainWindowController.didPositionWindowOnFirstRun { if AppDefaults.shared.isFirstRun && !MainWindowController.didPositionWindowOnFirstRun {
if let window = window, let screen = window.screen { if let window = window {
let width: CGFloat = 1280.0 let point = NSPoint(x: 128, y: 64)
let height: CGFloat = 768.0 let size = NSSize(width: 1000, height: 700)
let insetX: CGFloat = 192.0 let minSize = NSSize(width: 600, height: 600)
let insetY: CGFloat = 96.0 window.setPointAndSizeAdjustingForScreen(point: point, size: size, minimumSize: minSize)
window.setContentSize(NSSize(width: width, height: height))
window.setFrameTopLeftPoint(NSPoint(x: insetX, y: screen.visibleFrame.maxY - insetY))
MainWindowController.didPositionWindowOnFirstRun = true MainWindowController.didPositionWindowOnFirstRun = true
} }
} }