Skip to content

Commit 45c4d41

Browse files
committed
Disable Popover transient behaviour when adding new data
1 parent 17cf0e9 commit 45c4d41

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

TouchMemes/AppDelegate.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AppDelegate: NSObject, NSApplicationDelegate
1717
var storyBoard : NSStoryboard?
1818
var preferencesWindowController : NSWindowController?
1919

20-
let popover = NSPopover()
20+
static let popover = NSPopover()
2121
let statusItem = NSStatusBar.system.statusItem(withLength:NSStatusItem.squareLength)
2222

2323
func applicationDidFinishLaunching(_ aNotification: Notification) {
@@ -39,13 +39,13 @@ class AppDelegate: NSObject, NSApplicationDelegate
3939
button.action = #selector(togglePopover)
4040
}
4141

42-
popover.behavior = .transient
43-
popover.contentViewController = PreferencesViewController.freshController()
44-
popover.appearance = NSAppearance(named: .aqua)
42+
AppDelegate.popover.behavior = .transient
43+
AppDelegate.popover.contentViewController = PreferencesViewController.freshController()
44+
AppDelegate.popover.appearance = NSAppearance(named: .aqua)
4545
}
4646

4747
@objc func togglePopover(_ sender: Any?) {
48-
if popover.isShown {
48+
if AppDelegate.popover.isShown {
4949
closePopover(sender: sender)
5050
} else {
5151
showPopover(sender: sender)
@@ -55,12 +55,12 @@ class AppDelegate: NSObject, NSApplicationDelegate
5555
func showPopover(sender: Any?) {
5656
NSApplication.shared.activate(ignoringOtherApps: true)
5757
if let button = statusItem.button {
58-
popover.show(relativeTo: button.bounds, of: button, preferredEdge: NSRectEdge.minY)
58+
AppDelegate.popover.show(relativeTo: button.bounds, of: button, preferredEdge: NSRectEdge.minY)
5959
}
6060
}
6161

6262
func closePopover(sender: Any?) {
63-
popover.performClose(sender)
63+
AppDelegate.popover.performClose(sender)
6464
}
6565

6666
func loadUserPrefs () -> [String] {

TouchMemes/Controllers/PreferencesViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class PreferencesViewController: NSViewController {
8585

8686
@IBAction func addRow (sender: AnyObject) {
8787
let prompt = NSAlert()
88+
AppDelegate.popover.behavior = .applicationDefined
8889
let input = SheetTextField.init(frame: NSMakeRect(0,0,300,28))
8990
let inputView = NSScrollView.init(frame: NSMakeRect(0,0,300,28))
9091
inputView.hasVerticalScroller = true
@@ -103,6 +104,7 @@ class PreferencesViewController: NSViewController {
103104
self.tableView.reloadData()
104105
AppDelegate.saveUserPrefs()
105106
}
107+
AppDelegate.popover.behavior = .transient
106108
}
107109
}
108110

0 commit comments

Comments
 (0)