diff --git a/PercentCalculator/AppDelegate.swift b/PercentCalculator/AppDelegate.swift index 82d867d..4e8f262 100644 --- a/PercentCalculator/AppDelegate.swift +++ b/PercentCalculator/AppDelegate.swift @@ -79,7 +79,13 @@ class AppDelegate: NSObject, NSApplicationDelegate { } // MARK: Popover - Left click + func checkPopover(sender: AnyObject?){ + showPopover(sender: sender) + if !popover.isShown { + return "error" + } + } func showPopover(sender: AnyObject?) { eventMonitor?.start() if let button = statusItem.view { @@ -107,6 +113,10 @@ class AppDelegate: NSObject, NSApplicationDelegate { rightMenu.addItem(NSMenuItem(title: "Quit", action: #selector(quitDidPress(sender:)), keyEquivalent: "")) statusItem.popUpMenu(rightMenu) } + + func quitMenu(){ + NSMenuItem.shared().terminate(sender) + } func quitDidPress(sender: AnyObject?) { NSApplication.shared().terminate(sender) diff --git a/PercentCalculator/ViewController.swift b/PercentCalculator/ViewController.swift index df1f299..3c62988 100644 --- a/PercentCalculator/ViewController.swift +++ b/PercentCalculator/ViewController.swift @@ -12,6 +12,7 @@ enum PercentCalculator { case whatIsXpercentOfY case xIsYpercentOf case xIsWhatPercentOfY + case percentless func calculate(x: Double, y: Double) -> Double { switch self { @@ -21,6 +22,8 @@ enum PercentCalculator { return x * 100.0 / y case .xIsYpercentOf: return 100.0 / y * x + case .percentless: + return (x - y) / 100.0 } } } @@ -63,6 +66,7 @@ class ViewController: NSViewController { var viewModel1: PercentCalculatorViewModel! var viewModel2: PercentCalculatorViewModel! var viewModel3: PercentCalculatorViewModel! + var viewModel4: PercentCalculatorViewModel! @IBAction func quitButtonPressed(sender: NSButton) { NSApplication.shared().terminate(sender) @@ -88,6 +92,12 @@ class ViewController: NSViewController { x: xTextField3, y: yTextField3, result: resultTextField3) + + viewModel4 = PercentCalculatorViewModel( + type: .percentless, + x: xTextField4, + y: yTextField4, + result: resultTextField4) } }