fix: preferences panel icons wouldnt show on old macos versions

This commit is contained in:
lwouis committed 2024-10-12 12:56:12 +02:00
1 parent d46d90395c
commit 9258acf765
3 files changed
+10 -3

No files matched your search

+1
View File
@@ -53,6 +53,7 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Ameng * Ameng
* Anders * Anders
* Andrew Vader * Andrew Vader
* antoon334
* Anurag Roy * Anurag Roy
* anushree b * anushree b
* Arman * Arman
@@ -261,6 +261,7 @@ class LabelAndControl: NSObject {
} }
if #available(macOS 11.0, *) { if #available(macOS 11.0, *) {
if let preference = preference as? SfSymbolMacroPreference, if let preference = preference as? SfSymbolMacroPreference,
// each systemSymbolName has a different minimum macOS requirements; we need to make sure it exists
let symbolImage = NSImage(systemSymbolName: preference.symbolName, accessibilityDescription: nil) { let symbolImage = NSImage(systemSymbolName: preference.symbolName, accessibilityDescription: nil) {
button.setImage(symbolImage, forSegment: i) button.setImage(symbolImage, forSegment: i)
} }
@@ -67,9 +67,14 @@ class PreferencesWindow: NSWindow, NSToolbarDelegate {
let item = NSToolbarItem(itemIdentifier: identifier) let item = NSToolbarItem(itemIdentifier: identifier)
item.label = label item.label = label
if #available(macOS 11.0, *) { if #available(macOS 11.0, *) {
item.image = NSImage(systemSymbolName: image, accessibilityDescription: nil) // each systemSymbolName has a different minimum macOS requirements; we need to make sure it exists
} else { if let image = NSImage(systemSymbolName: image, accessibilityDescription: nil) {
item.image = NSImage.initTemplateCopy(image) item.image = image
}
}
// it seems that new instances of NSToolbarItems have their image set to a 1x1 image
if item.image == nil || item.image!.size == .init(width: 1, height: 1) {
item.image = NSImage.initTemplateCopy(id)
item.maxSize = .init(width: 22, height: 22) item.maxSize = .init(width: 22, height: 22)
} }
item.target = self item.target = self