zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: Set speed label font to system 9 regular

Browse Source
This commit is contained in:
yichengchen 2019-05-11 11:49:57 +08:00
parent cf15f17588
commit 94ede83f49
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ClashX/AppDelegate.swift
View File

@ -15,6 +15,9 @@ import RxSwift
import Fabric
import Crashlytics
private let statusItemLengthWithSpeed:CGFloat = 70
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
var statusItem: NSStatusItem!
@ -51,11 +54,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
signal(SIGPIPE, SIG_IGN)
// setup menu item first
statusItem = NSStatusBar.system.statusItem(withLength:65)
statusItem = NSStatusBar.system.statusItem(withLength:statusItemLengthWithSpeed)
statusItem.menu = statusMenu
statusItemView = StatusItemView.create(statusItem: statusItem)
statusItemView.frame = CGRect(x: 0, y: 0, width: 65, height: 22)
statusItemView.frame = CGRect(x: 0, y: 0, width: statusItemLengthWithSpeed, height: 22)
statusMenu.delegate = self
// crash recorder
@ -111,7 +114,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
.bind {[weak self] (show) in
guard let self = self else {return}
self.showNetSpeedIndicatorMenuItem.state = (show ?? true) ? .on : .off
let statusItemLength:CGFloat = (show ?? true) ? 65 : 25
let statusItemLength:CGFloat = (show ?? true) ? statusItemLengthWithSpeed : 25
self.statusItem.length = statusItemLength
self.statusItemView.frame.size.width = statusItemLength
self.statusItemView.showSpeedContainer(show: (show ?? true))

2
ClashX/Views/StatusItemView.swift
View File

@ -64,7 +64,7 @@ class StatusItemView: NSView {
}.disposed(by: disposeBag)
if #available(OSX 10.11, *) {
let font = NSFont.systemFont(ofSize: 8, weight: .medium)
let font = NSFont.systemFont(ofSize: 9, weight: .regular)
uploadSpeedLabel.font = font
downloadSpeedLabel.font = font
}