morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: improved popup toggling when clicking the same module widgets. When modules have a few widgets enabled and opened popup view, clicking on another widget the popup disappear. Now click will reopen popup view on the target widget, not close the view.

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-11-01 14:31:20 +01:00
parent a53de49bae
commit 3ab5958685
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Kit/module/module.swift
View File

@@ -282,7 +282,13 @@ open class Module: Module_p {
let openedWindows = NSApplication.shared.windows.filter{ $0 is NSPanel }
openedWindows.forEach{ $0.setIsVisible(false) }
if popup.occlusionState.rawValue == 8192 {
var reopen: Bool = false
if let widget = notification.userInfo?["widget"] as? widget_t {
reopen = popup.openedBy != nil && popup.openedBy != widget
popup.openedBy = widget
}
if popup.occlusionState.rawValue == 8192 || reopen {
NSApplication.shared.activate(ignoringOtherApps: true)
popup.contentView?.invalidateIntrinsicContentSize()
@@ -300,6 +306,7 @@ open class Module: Module_p {
popup.setIsVisible(true)
} else {
popup.locked = false
popup.openedBy = nil
popup.setIsVisible(false)
}
}