danbarber/persephone
1
1
Fork 0
mirror of https://github.com/danbee/persephone synced 2025-03-04 08:39:11 +00:00
Code Issues Releases Wiki Activity

Tidy up more of the window handling

Browse Source
This commit is contained in:
Daniel Barber 2019-05-03 10:54:15 -04:00
parent 9ec4ec82df
commit 392fc8c8e6
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
6 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Persephone/AppDelegate.swift
View File

@ -85,6 +85,14 @@ class AppDelegate: NSObject,
return dockMenu return dockMenu
} }
func setMainWindowStateMenuItem(state: MainWindowState) {
switch state {
case .open: mainWindowMenuItem.state = .on
case .closed: mainWindowMenuItem.state = .off
case .minimised: mainWindowMenuItem.state = .mixed
}
}
func handle(mediaKey: MediaKey, event: KeyEvent) { func handle(mediaKey: MediaKey, event: KeyEvent) {
switch mediaKey { switch mediaKey {
case .playPause: case .playPause:
@ -122,6 +130,6 @@ extension AppDelegate: StoreSubscriber {
func newState(state: UIState) { func newState(state: UIState) {
updateDatabaseMenuItem.isEnabled = !state.databaseUpdating updateDatabaseMenuItem.isEnabled = !state.databaseUpdating
mainWindowMenuItem.state = state.mainWindowOpen ? .on : .off setMainWindowStateMenuItem(state: state.mainWindowState)
} }
} }

8
Persephone/Controllers/WindowController.swift
View File

@ -149,6 +149,14 @@ extension WindowController: NSWindowDelegate {
func windowWillClose(_ notification: Notification) { func windowWillClose(_ notification: Notification) {
App.store.dispatch(MainWindowDidCloseAction()) App.store.dispatch(MainWindowDidCloseAction())
} }
func windowWillMiniaturize(_ notification: Notification) {
App.store.dispatch(MainWindowDidMinimizeAction())
}
func windowDidDeminiaturize(_ notification: Notification) {
App.store.dispatch(MainWindowDidOpenAction())
}
} }
extension WindowController: StoreSubscriber { extension WindowController: StoreSubscriber {

4
Persephone/Resources/Base.lproj/Main.storyboard
View File

@ -144,7 +144,7 @@
<scene sceneID="R2V-B0-nI4"> <scene sceneID="R2V-B0-nI4">
<objects> <objects>
<windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" customClass="WindowController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController"> <windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" customClass="WindowController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController">
<window key="window" title="Persephone" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA" customClass="MainWindow" customModule="Persephone" customModuleProvider="target"> <window key="window" title="Persephone" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="IQv-IB-iLA" customClass="MainWindow" customModule="Persephone" customModuleProvider="target">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="207" y="570" width="960" height="560"/> <rect key="contentRect" x="207" y="570" width="960" height="560"/>
@ -278,7 +278,7 @@
<scene sceneID="Rpk-bo-5kf"> <scene sceneID="Rpk-bo-5kf">
<objects> <objects>
<windowController showSeguePresentationStyle="single" id="xYu-7w-E5x" customClass="PreferencesWindowController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController"> <windowController showSeguePresentationStyle="single" id="xYu-7w-E5x" customClass="PreferencesWindowController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController">
<window key="window" title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" titleVisibility="hidden" id="3FN-my-6kU"> <window key="window" title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="3FN-my-6kU">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<rect key="contentRect" x="245" y="301" width="416" height="100"/> <rect key="contentRect" x="245" y="301" width="416" height="100"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/> <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>

2
Persephone/State/Actions/UIActions.swift
View File

@ -12,6 +12,8 @@ struct MainWindowDidOpenAction: Action {}
struct MainWindowDidCloseAction: Action {} struct MainWindowDidCloseAction: Action {}
struct MainWindowDidMinimizeAction: Action {}
struct DatabaseUpdateStartedAction: Action {} struct DatabaseUpdateStartedAction: Action {}
struct DatabaseUpdateFinishedAction: Action {} struct DatabaseUpdateFinishedAction: Action {}

7
Persephone/State/Reducers/UIReducer.swift
View File

@ -13,10 +13,13 @@ func uiReducer(action: Action, state: UIState?) -> UIState {
switch action { switch action {
case is MainWindowDidOpenAction: case is MainWindowDidOpenAction:
state.mainWindowOpen = true state.mainWindowState = .open
case is MainWindowDidCloseAction: case is MainWindowDidCloseAction:
state.mainWindowOpen = false state.mainWindowState = .closed
case is MainWindowDidMinimizeAction:
state.mainWindowState = .minimised
case is DatabaseUpdateStartedAction: case is DatabaseUpdateStartedAction:
state.databaseUpdating = true state.databaseUpdating = true

8
Persephone/State/UIState.swift
View File

@ -8,7 +8,13 @@
import ReSwift import ReSwift
enum MainWindowState {
case open
case closed
case minimised
}
struct UIState: StateType { struct UIState: StateType {
var mainWindowOpen: Bool = false var mainWindowState: MainWindowState = .closed
var databaseUpdating: Bool = false var databaseUpdating: Bool = false
} }