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

fix: set color for efficiency and performance cores in the BarChart widget based on the selected color in the popup view settings (#1686)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2023-11-25 22:31:50 +01:00
parent 2686ae845f
commit d144aa68de
4 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Modules/CPU/main.swift
View File

@@ -76,6 +76,23 @@ public class CPU: Module {
return color.additional as! NSColor
}
private var eCoreColor: NSColor {
let color = Color.teal
let key = Store.shared.string(key: "\(self.config.name)_eCoresColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
}
private var pCoreColor: NSColor {
let color = Color.secondBlue
let key = Store.shared.string(key: "\(self.config.name)_pCoresColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
}
public init() {
self.settingsView = Settings("CPU")
self.popupView = Popup("CPU")
@@ -187,18 +204,32 @@ public class CPU: Module {
case let widget as LineChart: widget.setValue(value.totalUsage)
case let widget as BarChart:
var val: [[ColorValue]] = [[ColorValue(value.totalUsage)]]
let cores = SystemKit.shared.device.info.cpu?.cores ?? []
if self.usagePerCoreState {
val = value.usagePerCore.map({ [ColorValue($0)] })
if widget.colorState == .cluster {
val = []
for (i, v) in value.usagePerCore.enumerated() {
let core = cores.first(where: {$0.id == i })
val.append([ColorValue(v, color: core?.type == .efficiency ? self.eCoreColor : self.pCoreColor)])
}
} else {
val = value.usagePerCore.map({ [ColorValue($0)] })
}
} else if self.splitValueState {
val = [[
ColorValue(value.systemLoad, color: self.systemColor),
ColorValue(value.userLoad, color: self.userColor)
]]
} else if self.groupByClustersState, let e = value.usageECores, let p = value.usagePCores {
val = [
[ColorValue(e, color: NSColor.systemTeal)],
[ColorValue(p, color: NSColor.systemBlue)]
]
if widget.colorState == .cluster {
val = [
[ColorValue(e, color: self.eCoreColor)],
[ColorValue(p, color: self.pCoreColor)]
]
} else {
val = [[ColorValue(e)], [ColorValue(p)]]
}
}
widget.setValue(val)
case let widget as PieChart: