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

feat: updated Disk portal view

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-01-27 21:22:59 +01:00
parent a2a9b1aee3
commit d6a88e5d78
7 changed files with 132 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kit/Widgets/NetworkChart.swift
View File

@@ -24,7 +24,7 @@ public class NetworkChart: WidgetWrapper {
private var chart: NetworkChartView = NetworkChartView(
frame: NSRect(x: 0, y: 0, width: 30, height: Constants.Widget.height - (2*Constants.Widget.margin.y)),
num: 60, minMax: false
num: 60, minMax: false, toolTip: false
)
private var width: CGFloat {
get {

16
Kit/plugins/Charts.swift
View File

@@ -300,14 +300,16 @@ public class NetworkChartView: NSView {
private var commonScale: Bool = true
private var reverseOrder: Bool = false
private var cursorToolTip: Bool = false
private var cursor: NSPoint? = nil
private var stop: Bool = false
public init(frame: NSRect, num: Int, minMax: Bool = true, outColor: NSColor = .systemRed, inColor: NSColor = .systemBlue) {
public init(frame: NSRect, num: Int, minMax: Bool = true, outColor: NSColor = .systemRed, inColor: NSColor = .systemBlue, toolTip: Bool = false) {
self.minMax = minMax
self.points = Array(repeating: (0, 0), count: num)
self.topColor = inColor
self.bottomColor = outColor
self.cursorToolTip = toolTip
super.init(frame: frame)
self.addTrackingArea(NSTrackingArea(
@@ -561,30 +563,36 @@ public class NetworkChartView: NSView {
}
public override func mouseEntered(with event: NSEvent) {
guard self.cursorToolTip else { return }
self.cursor = convert(event.locationInWindow, from: nil)
self.needsDisplay = true
}
public override func mouseMoved(with event: NSEvent) {
guard self.cursorToolTip else { return }
self.cursor = convert(event.locationInWindow, from: nil)
self.needsDisplay = true
}
public override func mouseDragged(with event: NSEvent) {
guard self.cursorToolTip else { return }
self.cursor = convert(event.locationInWindow, from: nil)
self.needsDisplay = true
}
public override func mouseExited(with event: NSEvent) {
guard self.cursorToolTip else { return }
self.cursor = nil
self.needsDisplay = true
}
public override func mouseDown(with: NSEvent) {
guard self.cursorToolTip else { return }
self.shadowPoints = self.points
self.stop = true
}
public override func mouseUp(with: NSEvent) {
guard self.cursorToolTip else { return }
self.stop = false
}
}
@@ -858,11 +866,11 @@ public class BarChartView: NSView {
let value = self.values[i]
let color = value.color ?? .controlAccentColor
let activeBlockNum = Int(round(value.value*Double(blocks)))
let h = value.value*partitionSize.height
let h = value.value*(partitionSize.height-spacing)
if dirtyRect.height < 30 && h != 0 {
if dirtyRect.height < 30 && h != 0 {
let block = NSBezierPath(
roundedRect: NSRect(x: x+spacing, y: 1, width: partitionSize.width-(spacing*2), height: value.value*partitionSize.height),
roundedRect: NSRect(x: x+spacing, y: 1, width: partitionSize.width-(spacing*2), height: h),
xRadius: 1, yRadius: 1
)
color.setFill()