Skip to content

Commit b556aae

Browse files
authored
[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
1 parent 06aef95 commit b556aae

File tree

1 file changed

+6
-29
lines changed

1 file changed

+6
-29
lines changed

hidden/ViewControlllers/StatusBarController.swift

+6-29
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ class StatusBarController{
2222

2323
func initView(){
2424

25-
appMenu = setupMenuUI()
2625

2726
if let button = seprateStatusBar.button {
2827
button.image = NSImage(named:NSImage.Name("ic_line"))
2928
}
3029

30+
appMenu = setupMenuUI()
31+
seprateStatusBar.menu = appMenu
32+
3133
if let button = expandCollapseStatusBar.button {
3234
button.image = NSImage(named:NSImage.Name("ic_collapse"))
33-
btnDot = NSStatusBarButton.collapseBarButtonItem()
34-
btnDot?.target = self
35-
btnDot?.action = #selector(statusBarButtonClicked(_:))
36-
button.addSubview(btnDot!)
35+
button.target = self
36+
button.action = #selector(expandCollapseIfNeeded(_:))
3737
}
3838

3939

@@ -58,30 +58,7 @@ class StatusBarController{
5858
return Float((expandCollapseStatusBar.button?.getOrigin!.x)!) > Float((seprateStatusBar.button?.getOrigin!.x)!)
5959
}
6060

61-
@objc func statusBarButtonClicked(_ sender: NSStatusBarButton) {
62-
let event = NSApp.currentEvent!
63-
64-
if event.type == NSEvent.EventType.rightMouseUp {
65-
openAppMenu()
66-
} else {
67-
expandCollapseIfNeeded()
68-
}
69-
}
70-
71-
private func openAppMenu()
72-
{
73-
if (appMenu != nil)
74-
{
75-
expandCollapseStatusBar.menu = appMenu //set the menu
76-
77-
let p = NSPoint(x: 0,
78-
y: (expandCollapseStatusBar.statusBar?.thickness)!)
79-
self.appMenu!.popUp(positioning: self.appMenu!.item(at: 0), at:p , in: btnDot)
80-
81-
}
82-
}
83-
84-
@objc func expandCollapseIfNeeded() {
61+
@objc func expandCollapseIfNeeded(_ sender: NSStatusBarButton) {
8562
if(isValidPosition())
8663
{
8764
if isToggle == false {

0 commit comments

Comments
 (0)