From b556aae8ee1e2b6434cad3308ed808a858feb892 Mon Sep 17 00:00:00 2001
From: Le Dien Phuc <phucledien@gmail.com>
Date: Tue, 10 Dec 2019 14:32:51 +0700
Subject: [PATCH] [hotfix] Update way to quit the app (#20)

- Click to seperator button to show menu
- Click to expanseCollapse button to expand or collapse menu bar
---
 .../StatusBarController.swift                 | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/hidden/ViewControlllers/StatusBarController.swift b/hidden/ViewControlllers/StatusBarController.swift
index 4c106b4..33c1234 100644
--- a/hidden/ViewControlllers/StatusBarController.swift
+++ b/hidden/ViewControlllers/StatusBarController.swift
@@ -22,18 +22,18 @@ class StatusBarController{
     
     func initView(){
         
-        appMenu = setupMenuUI()
         
         if let button = seprateStatusBar.button {
             button.image = NSImage(named:NSImage.Name("ic_line"))
         }
         
+        appMenu = setupMenuUI()
+        seprateStatusBar.menu = appMenu
+        
         if let button = expandCollapseStatusBar.button {
                         button.image = NSImage(named:NSImage.Name("ic_collapse"))
-                        btnDot = NSStatusBarButton.collapseBarButtonItem()
-                        btnDot?.target = self
-                        btnDot?.action = #selector(statusBarButtonClicked(_:))
-                        button.addSubview(btnDot!)
+                        button.target = self
+                        button.action = #selector(expandCollapseIfNeeded(_:))
         }
         
 
@@ -58,30 +58,7 @@ class StatusBarController{
         return Float((expandCollapseStatusBar.button?.getOrigin!.x)!) > Float((seprateStatusBar.button?.getOrigin!.x)!)
     }
     
-    @objc func statusBarButtonClicked(_ sender: NSStatusBarButton) {
-        let event = NSApp.currentEvent!
-        
-        if event.type == NSEvent.EventType.rightMouseUp {
-            openAppMenu()
-        } else {
-            expandCollapseIfNeeded()
-        }
-    }
-    
-    private func openAppMenu()
-    {
-        if (appMenu != nil)
-        {
-            expandCollapseStatusBar.menu = appMenu //set the menu
-            
-            let p = NSPoint(x: 0,
-                            y: (expandCollapseStatusBar.statusBar?.thickness)!)
-            self.appMenu!.popUp(positioning: self.appMenu!.item(at: 0), at:p , in: btnDot)
-            
-        }
-    }
-    
-    @objc func expandCollapseIfNeeded() {
+    @objc func expandCollapseIfNeeded(_ sender: NSStatusBarButton) {
         if(isValidPosition())
         {
             if isToggle == false {