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: fixed CPU line chart baseline in the popup view

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2023-10-12 20:51:32 +02:00
parent 6ba72713f0
commit 66641a1817
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Kit/plugins/Charts.swift
View File

@@ -125,13 +125,13 @@ public class LineChartView: NSView {
context.setShouldAntialias(true)
let offset: CGFloat = 1 / (NSScreen.main?.backingScaleFactor ?? 1)
let height: CGFloat = dirtyRect.height - self.frame.origin.y - offset
let xRatio: CGFloat = dirtyRect.width / CGFloat(points.count-1)
let height: CGFloat = self.frame.height - self.frame.origin.y - offset
let xRatio: CGFloat = self.frame.width / CGFloat(points.count-1)
let list = points.enumerated().compactMap { (i: Int, v: Double) -> (value: Double, point: CGPoint) in
return (v, CGPoint(
x: (CGFloat(i) * xRatio) + dirtyRect.origin.x,
y: scaleValue(scale: self.scale, value: v, maxValue: maxValue, maxHeight: height) + dirtyRect.origin.y + offset
x: (CGFloat(i) * xRatio) + self.frame.origin.x,
y: scaleValue(scale: self.scale, value: v, maxValue: maxValue, maxHeight: height) + self.frame.origin.y + offset
))
}
@@ -375,7 +375,7 @@ public class NetworkChartView: NSView {
underLinePath.close()
underLinePath.addClip()
self.outColor.withAlphaComponent(0.5).setFill()
NSBezierPath(rect: dirtyRect).fill()
NSBezierPath(rect: self.frame).fill()
context.restoreGState()
context.saveGState()
@@ -386,7 +386,7 @@ public class NetworkChartView: NSView {
underLinePath.close()
underLinePath.addClip()
self.inColor.withAlphaComponent(0.5).setFill()
NSBezierPath(rect: dirtyRect).fill()
NSBezierPath(rect: self.frame).fill()
context.restoreGState()

13
Modules/CPU/popup.swift
View File

@@ -246,16 +246,9 @@ internal class Popup: PopupWrapper {
box.layer?.backgroundColor = NSColor.lightGray.withAlphaComponent(0.1).cgColor
box.layer?.cornerRadius = 3
let chart = LineChartView(frame: NSRect(
x: Constants.Popup.spacing,
y: Constants.Popup.spacing,
width: view.frame.width - (Constants.Popup.spacing*2),
height: box.frame.height - Constants.Popup.spacing
), num: 120)
chart.color = self.chartColor
self.lineChart = chart
box.addSubview(chart)
self.lineChart = LineChartView(frame: NSRect(x: 1, y: 0, width: box.frame.width, height: box.frame.height), num: 120)
self.lineChart?.color = self.chartColor
box.addSubview(self.lineChart!)
return box
}()