@@ -15,49 +15,52 @@ class StatusBarController {
1515
1616 //MARK: - BarItems
1717
18- private let expandCollapseStatusBar = NSStatusBar . system. statusItem ( withLength: NSStatusItem . variableLength)
19- private let separateStatusBar = NSStatusBar . system. statusItem ( withLength: NSStatusItem . variableLength )
20- private var alwayHideSeparateStatusBar : NSStatusItem ? = nil
18+ private let btnExpandCollapse = NSStatusBar . system. statusItem ( withLength: NSStatusItem . variableLength)
19+ private let btnSeparate = NSStatusBar . system. statusItem ( withLength: 1 )
20+ private var btnAlwaysHidden : NSStatusItem ? = nil
2121
22- private var normalSeparateStatusBarIconLength : CGFloat { return Preferences . areSeparatorsHidden ? 0 : 20 }
23- private let collapseSeparateStatusBarIconLength : CGFloat = 10000
22+ private var btnHiddenLength : CGFloat = 20
23+ private let btnHiddenCollapseLength : CGFloat = 10000
2424
25- private let normalTerminateStatusBarIconLength : CGFloat = Preferences . alwaysHiddenSectionEnabled ? 20 : 0
26- private let collapseTerminateStatusBarIconLength : CGFloat = Preferences . alwaysHiddenSectionEnabled ? 10000 : 0
25+ private let btnAlwaysHiddenLength : CGFloat = Preferences . alwaysHiddenSectionEnabled ? 20 : 0
26+ private let btnAlwaysHiddenEnableExpandCollapseLength : CGFloat = Preferences . alwaysHiddenSectionEnabled ? 10000 : 0
2727
2828 private let imgIconLine = NSImage ( named: NSImage . Name ( " ic_line " ) )
2929
3030 private var isCollapsed : Bool {
31- return self . separateStatusBar . length == self . collapseSeparateStatusBarIconLength
31+ return self . btnSeparate . length == self . btnHiddenCollapseLength
3232 }
3333
34- private var isValidPosition : Bool {
34+ private var isBtnSeparateValidPosition : Bool {
3535 guard
36- let expandBarButtonX = self . expandCollapseStatusBar . button? . getOrigin? . x,
37- let separateBarButtonX = self . separateStatusBar . button? . getOrigin? . x
36+ let btnExpandCollapseX = self . btnExpandCollapse . button? . getOrigin? . x,
37+ let btnSeparateX = self . btnSeparate . button? . getOrigin? . x
3838 else { return false }
3939
4040 if Constant . isUsingLTRLanguage {
41- return expandBarButtonX >= separateBarButtonX
41+ return btnExpandCollapseX >= btnSeparateX
4242 } else {
43- return expandBarButtonX <= separateBarButtonX
43+ return btnExpandCollapseX <= btnSeparateX
4444 }
4545 }
46- private var isValidTogglablePosition : Bool {
46+
47+ private var isBtnAlwaysHiddenValidPosition : Bool {
4748 if !Preferences. alwaysHiddenSectionEnabled { return true }
4849
4950 guard
50- let separateBarButtonX = self . separateStatusBar . button? . getOrigin? . x,
51- let terminateBarButtonX = self . alwayHideSeparateStatusBar ? . button? . getOrigin? . x
51+ let btnSeparateX = self . btnSeparate . button? . getOrigin? . x,
52+ let btnAlwaysHiddenX = self . btnAlwaysHidden ? . button? . getOrigin? . x
5253 else { return false }
5354
5455 if Constant . isUsingLTRLanguage {
55- return separateBarButtonX >= terminateBarButtonX
56+ return btnSeparateX >= btnAlwaysHiddenX
5657 } else {
57- return separateBarButtonX <= terminateBarButtonX
58+ return btnSeparateX <= btnAlwaysHiddenX
5859 }
5960 }
6061
62+ private var isToggle = false
63+
6164 //MARK: - Methods
6265 init ( ) {
6366
@@ -72,27 +75,27 @@ class StatusBarController {
7275 }
7376
7477 private func setupUI( ) {
75- if let button = separateStatusBar . button {
78+ if let button = btnSeparate . button {
7679 button. image = self . imgIconLine
7780 }
7881 let menu = self . getContextMenu ( )
79- separateStatusBar . menu = menu
82+ btnSeparate . menu = menu
8083
8184 updateAutoCollapseMenuTitle ( )
8285
83- if let button = expandCollapseStatusBar . button {
86+ if let button = btnExpandCollapse . button {
8487 button. image = Assets . collapseImage
8588 button. target = self
8689
87- button. action = #selector( self . expandCollapseButtonPressed ( sender: ) )
90+ button. action = #selector( self . btnExpandCollapsePressed ( sender: ) )
8891 button. sendAction ( on: [ . leftMouseUp, . rightMouseUp] )
8992 }
9093
91- expandCollapseStatusBar . autosaveName = " hiddenbar_expandcollapse " ;
92- separateStatusBar . autosaveName = " hiddenbar_separate " ;
94+ btnExpandCollapse . autosaveName = " hiddenbar_expandcollapse " ;
95+ btnSeparate . autosaveName = " hiddenbar_separate " ;
9396 }
9497
95- @objc func expandCollapseButtonPressed ( sender: NSStatusBarButton ) {
98+ @objc func btnExpandCollapsePressed ( sender: NSStatusBarButton ) {
9699 if let event = NSApp . currentEvent {
97100
98101 let isOptionKeyPressed = event. modifierFlags. contains ( NSEvent . ModifierFlags. option)
@@ -115,53 +118,59 @@ class StatusBarController {
115118 Preferences . areSeparatorsHidden = false
116119
117120 if !self . isCollapsed {
118- self . separateStatusBar . length = self . normalSeparateStatusBarIconLength
121+ self . btnSeparate . length = self . btnHiddenLength
119122 }
120- self . alwayHideSeparateStatusBar ? . length = self . normalTerminateStatusBarIconLength
123+ self . btnAlwaysHidden ? . length = self . btnAlwaysHiddenLength
121124 }
122125
123126 private func hideSeparators( ) {
124- guard self . isValidTogglablePosition else { return }
127+ guard self . isBtnAlwaysHiddenValidPosition else { return }
125128
126129 Preferences . areSeparatorsHidden = true
127130
128131 if !self . isCollapsed {
129- self . separateStatusBar . length = self . normalSeparateStatusBarIconLength
132+ self . btnSeparate . length = self . btnHiddenLength
130133 }
131- self . alwayHideSeparateStatusBar ? . length = self . collapseTerminateStatusBarIconLength
134+ self . btnAlwaysHidden ? . length = self . btnAlwaysHiddenEnableExpandCollapseLength
132135 }
133136
134137 func expandCollapseIfNeeded( ) {
138+ //prevented rapid click cause icon show many in Dock
139+ if isToggle { return }
140+ isToggle = true
135141 self . isCollapsed ? self . expandMenubar ( ) : self . collapseMenuBar ( )
142+ DispatchQueue . main. asyncAfter ( deadline: . now( ) + 0.3 ) {
143+ self . isToggle = false
144+ }
136145 }
137146
138147 private func collapseMenuBar( ) {
139- guard self . isValidPosition && !self . isCollapsed else {
148+ guard self . isBtnSeparateValidPosition && !self . isCollapsed else {
140149 autoCollapseIfNeeded ( )
141150 return
142151 }
143152
144- separateStatusBar . length = self . collapseSeparateStatusBarIconLength
145- if let button = expandCollapseStatusBar . button {
153+ btnSeparate . length = self . btnHiddenCollapseLength
154+ if let button = btnExpandCollapse . button {
146155 button. image = Assets . expandImage
147156 }
148157 if Preferences . useFullStatusBarOnExpandEnabled {
149158 NSApp . setActivationPolicy ( . accessory)
150159 NSApp . deactivate ( )
151160 }
152161 }
153-
154162 private func expandMenubar( ) {
155163 guard self . isCollapsed else { return }
156- separateStatusBar . length = normalSeparateStatusBarIconLength
157- if let button = expandCollapseStatusBar . button {
164+ btnSeparate . length = btnHiddenLength
165+ if let button = btnExpandCollapse . button {
158166 button. image = Assets . collapseImage
159167 }
160168 autoCollapseIfNeeded ( )
161169
162170 if Preferences . useFullStatusBarOnExpandEnabled {
163171 NSApp . setActivationPolicy ( . regular)
164172 NSApp . activate ( ignoringOtherApps: true )
173+
165174 }
166175 }
167176
@@ -203,7 +212,7 @@ class StatusBarController {
203212 }
204213
205214 private func updateAutoCollapseMenuTitle( ) {
206- guard let toggleAutoHideItem = separateStatusBar . menu? . item ( withTag: 1 ) else { return }
215+ guard let toggleAutoHideItem = btnSeparate . menu? . item ( withTag: 1 ) else { return }
207216 if Preferences . isAutoHide {
208217 toggleAutoHideItem. title = " Disable Auto Collapse " . localized
209218 } else {
@@ -234,15 +243,15 @@ extension StatusBarController {
234243 }
235244 @objc private func toggleStatusBarIfNeeded( ) {
236245 if Preferences . alwaysHiddenSectionEnabled {
237- self . alwayHideSeparateStatusBar = NSStatusBar . system. statusItem ( withLength: 20 )
238- if let button = alwayHideSeparateStatusBar ? . button {
246+ self . btnAlwaysHidden = NSStatusBar . system. statusItem ( withLength: 20 )
247+ if let button = btnAlwaysHidden ? . button {
239248 button. image = self . imgIconLine
240249 button. appearsDisabled = true
241250 }
242- self . alwayHideSeparateStatusBar ? . autosaveName = " hiddenbar_terminate " ;
251+ self . btnAlwaysHidden ? . autosaveName = " hiddenbar_terminate " ;
243252
244253 } else {
245- self . alwayHideSeparateStatusBar = nil
254+ self . btnAlwaysHidden = nil
246255 }
247256 }
248257}
0 commit comments