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: moved from the HEX colors to the RGB

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2023-06-20 16:51:19 +02:00
parent 9e2517dcbb
commit ff6b0ed865
8 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Kit/extensions.swift
View File

@@ -469,24 +469,6 @@ extension URL {
}
public extension NSColor {
convenience init(hexString: String, alpha: CGFloat = 1.0) {
let hexString: String = hexString.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
let scanner = Scanner(string: hexString)
if hexString.hasPrefix("#") {
scanner.scanLocation = 1
}
var color: UInt32 = 0
scanner.scanHexInt32(&color)
let mask = 0x000000FF
let r = Int(color >> 16) & mask
let g = Int(color >> 8) & mask
let b = Int(color) & mask
let red = CGFloat(r) / 255.0
let green = CGFloat(g) / 255.0
let blue = CGFloat(b) / 255.0
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
func grayscaled() -> NSColor {
guard let space = CGColorSpace(name: CGColorSpace.extendedGray),
let cg = self.cgColor.converted(to: space, intent: .perceptual, options: nil),

4
Kit/module/settings.swift
View File

@@ -277,7 +277,7 @@ class WidgetSelectorView: NSStackView {
let separator = NSView()
separator.identifier = NSUserInterfaceItemIdentifier(rawValue: "separator")
separator.wantsLayer = true
separator.layer?.backgroundColor = NSColor(hexString: "#d5d5d5").cgColor
separator.layer?.backgroundColor = NSColor(red: 213/255, green: 213/255, blue: 213/255, alpha: 1).cgColor
self.addArrangedSubview(separator)
inactive.forEach { (widget: WidgetPreview) in
@@ -414,7 +414,7 @@ internal class WidgetPreview: NSStackView {
self.wantsLayer = true
self.layer?.cornerRadius = 2
self.layer?.borderColor = NSColor(hexString: "#dddddd").cgColor
self.layer?.borderColor = NSColor(red: 221/255, green: 221/255, blue: 221/255, alpha: 1).cgColor
self.layer?.borderWidth = 1
self.layer?.backgroundColor = NSColor.white.cgColor

2
Kit/types.swift
View File

@@ -193,7 +193,7 @@ extension Color: CaseIterable {
public static var indigo: Color { if #available(OSX 10.15, *) {
return Color(key: "indigo", value: "Indigo", additional: NSColor.systemIndigo)
} else {
return Color(key: "indigo", value: "Indigo", additional: NSColor(hexString: "#4B0082"))
return Color(key: "indigo", value: "Indigo", additional: NSColor(red: 75, green: 0, blue: 130, alpha: 1))
} }
public static var allCases: [Color] {

2
Modules/Bluetooth/popup.swift
View File

@@ -100,7 +100,7 @@ internal class BLEView: NSStackView {
}
override func updateLayer() {
self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor
self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor
}
public func update(_ batteryLevel: [KeyValue_t]) {

2
Modules/Clock/popup.swift
View File

@@ -134,7 +134,7 @@ private class ClockView: NSStackView {
}
override func updateLayer() {
self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor
self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor
}
private func setTZ() {

2
Modules/Disk/popup.swift
View File

@@ -230,7 +230,7 @@ internal class DiskView: NSStackView {
}
override func updateLayer() {
self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor
self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor
}
public func update(free: Int64, smart: smart_t?) {

2
Modules/GPU/popup.swift
View File

@@ -102,7 +102,7 @@ private class GPUView: NSStackView {
}
override func updateLayer() {
self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor
self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor
}
private func title() -> NSView {

2
Modules/Sensors/popup.swift
View File

@@ -541,7 +541,7 @@ internal class FanView: NSStackView {
}
override func updateLayer() {
self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor
self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor
}
private func nameAndSpeed() {