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

changed battery widget percentage view; changed the source for battery charging information

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2019-09-10 19:01:12 +02:00
parent c7cd2288ca
commit c024d9f021
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Stats/Modules/Battery/Battery.swift
View File

@@ -38,17 +38,19 @@ class Battery: Module {
func start() {
if !self.reader.value.value.isEmpty {
let value = self.reader.value!.value
(self.view as! BatteryWidget).setCharging(value: value.first! > 0)
(self.view as! Widget).setValue(data: [abs(value.first!)])
}
(self.view as! BatteryWidget).setCharging(value: (self.reader as! BatteryReader).usage.value.isCharged)
self.reader.start()
self.reader.value.subscribe(observer: self) { (value, _) in
if !value.isEmpty {
(self.view as! BatteryWidget).setCharging(value: value.first! > 0)
(self.view as! Widget).setValue(data: [abs(value.first!)])
}
}
(self.reader as! BatteryReader).usage.subscribe(observer: self) { (value, _) in
(self.view as! BatteryWidget).setCharging(value: value.isCharged)
}
}
func initWidget() {

30
Stats/Widgets/BatteryWidget.swift
View File

@@ -17,7 +17,8 @@ class BatteryWidget: NSView, Widget {
let defaults = UserDefaults.standard
let batteryWidth: CGFloat = 32
let percentageWidth: CGFloat = 40
let percentageWidth: CGFloat = 30
let percentageWidthFull: CGFloat = 37
var color: Bool = false
var value: Double {
@@ -39,7 +40,7 @@ class BatteryWidget: NSView, Widget {
var percentageValue: NSTextField = NSTextField()
override init(frame: NSRect) {
self.value = 1.0
self.value = 0.0
self.charging = false
self.percentage = false
super.init(frame: CGRect(x: 0, y: 0, width: self.size, height: widgetSize.height))
@@ -111,7 +112,12 @@ class BatteryWidget: NSView, Widget {
func percentageView() {
if self.percentage {
percentageValue = NSTextField(frame: NSMakeRect(0, 0, percentageWidth, self.frame.size.height - 2))
var width = percentageWidth
if self.value == 1 {
width = percentageWidthFull
}
percentageValue = NSTextField(frame: NSMakeRect(0, 0, width, self.frame.size.height - 2))
percentageValue.isEditable = false
percentageValue.isSelectable = false
percentageValue.isBezeled = false
@@ -119,12 +125,12 @@ class BatteryWidget: NSView, Widget {
percentageValue.textColor = .labelColor
percentageValue.backgroundColor = .controlColor
percentageValue.canDrawSubviewsIntoLayer = true
percentageValue.alignment = .natural
percentageValue.font = NSFont.systemFont(ofSize: 13, weight: .light)
percentageValue.alignment = .right
percentageValue.font = NSFont.systemFont(ofSize: 12, weight: .regular)
percentageValue.stringValue = "\(Int(self.value * 100))%"
self.addSubview(percentageValue)
self.frame = CGRect(x: 0, y: 0, width: batteryWidth + percentageWidth, height: self.frame.size.height)
self.frame = CGRect(x: 0, y: 0, width: batteryWidth + width, height: self.frame.size.height)
} else {
for subview in self.subviews {
subview.removeFromSuperview()
@@ -144,6 +150,18 @@ class BatteryWidget: NSView, Widget {
if self.value != value {
self.value = value
if self.value == 1 && self.frame.size.width != batteryWidth + percentageWidthFull {
self.percentage = false
self.percentageView()
self.percentage = true
self.percentageView()
} else if self.value != 1 && self.frame.size.width != batteryWidth + percentageWidth {
self.percentage = false
self.percentageView()
self.percentage = true
self.percentageView()
}
if percentage {
self.percentageValue.stringValue = "\(Int(self.value * 100))%"
}