swiftbar/SwiftBar
1
1
Fork 0
mirror of https://github.com/swiftbar/SwiftBar.git synced 2024-09-17 19:27:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #229 from rarango9/bugfix/issue-228

Browse Source 
Bugfix/issue 228
This commit is contained in:
Alex Mazanov 2021-10-04 09:25:59 -04:00 committed by GitHub
commit 88f43a1a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SwiftBar/MenuBar/MenuBarItem.swift
View File

@ -136,7 +136,7 @@ extension MenubarItem: NSMenuDelegate {
params.params["color"] = "white"
params.params["sfcolor"] = "white"
if !AppShared.isReduceTransparencyEnabled {
barItem.button?.attributedTitle = atributedTitle(with: params).title
barItem.button?.attributedTitle = atributedTitle(with: params, pad: true).title
}
hotKeys.forEach { $0.isPaused = true }
@ -500,7 +500,7 @@ extension MenubarItem {
barItem.button?.image = image
barItem.button?.imagePosition = .imageLeft
}
barItem.button?.attributedTitle = atributedTitle(with: params).title
barItem.button?.attributedTitle = atributedTitle(with: params, pad: true).title
}
func cycleThroughTitles() {
@ -511,7 +511,7 @@ extension MenubarItem {
setMenuTitle(title: titleLines[currentTitleLineIndex])
}
func atributedTitle(with params: MenuLineParameters) -> (title: NSAttributedString, tooltip: String) {
func atributedTitle(with params: MenuLineParameters, pad: Bool = false) -> (title: NSAttributedString, tooltip: String) {
var title = params.trim ? params.title.trimmingCharacters(in: .whitespaces) : params.title
guard !title.isEmpty else { return (NSAttributedString(), "") }
@ -541,6 +541,11 @@ extension MenubarItem {
if params.ansi {
attributedTitle = title.colorizedWithANSIColor()
}
if attributedTitle.length > 0, pad {
attributedTitle.insert(NSAttributedString(string: " "), at: 0)
}
if !params.ansi {
attributedTitle.addAttributes([.foregroundColor: color],
range: NSRange(0 ..< attributedTitle.length))
@ -622,7 +627,7 @@ extension MenubarItem {
if params.refresh {
plugin?.refresh()
updateMenu(content: plugin?.content) //dumb fix for #221, ideally come up with something better...
updateMenu(content: plugin?.content) // dumb fix for #221, ideally come up with something better...
return true
}
return false