toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-11 17:38:38 +00:00
Code Issues Releases Wiki Activity

* NSButtonCell

Browse Source
This commit is contained in:
ad 2018-04-26 22:36:12 +03:00
parent 9c1e5f5032
commit e1268d0d65
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MTMR/CustomButtonTouchBarItem.swift
View File

@ -22,8 +22,11 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
super.init(identifier: identifier) super.init(identifier: identifier)
button = NSButton(title: title, target: self, action: nil) button = NSButton(title: title, target: self, action: nil)
button.cell = CustomButtonCell(backgroundColor: bezelColor!)
button.cell?.title = title
button.bezelColor = bezelColor button.bezelColor = bezelColor
button.title = title
self.view = button self.view = button
longClick = NSPressGestureRecognizer(target: self, action: #selector(handleGestureLong)) longClick = NSPressGestureRecognizer(target: self, action: #selector(handleGestureLong))
@ -82,3 +85,23 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
} }
} }
class CustomButtonCell: NSButtonCell {
init(backgroundColor: NSColor) {
super.init(textCell: "")
if backgroundColor != .clear {
self.isBordered = true
self.bezelStyle = .rounded
self.backgroundColor = backgroundColor
} else {
self.isBordered = false
}
self.font = NSFont.systemFont(ofSize: 15, weight: .regular )
}
required init(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

16
MTMR/CustomSlider.swift
View File

@ -49,19 +49,19 @@ class CustomSliderCell: NSSliderCell {
override func drawBar(inside aRect: NSRect, flipped: Bool) { override func drawBar(inside aRect: NSRect, flipped: Bool) {
_barRect = aRect _barRect = aRect
var rect = aRect
rect.size.height = CGFloat(4)
let barRadius = CGFloat(2) let barRadius = CGFloat(2)
let value = CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 12))
var leftRect = rect var bgRect = aRect
leftRect.size.width = finalWidth bgRect.size.height = CGFloat(4)
let bg = NSBezierPath(roundedRect: rect, xRadius: barRadius, yRadius: barRadius)
let bg = NSBezierPath(roundedRect: bgRect, xRadius: barRadius, yRadius: barRadius)
NSColor.lightGray.setFill() NSColor.lightGray.setFill()
bg.fill() bg.fill()
let active = NSBezierPath(roundedRect: leftRect, xRadius: barRadius, yRadius: barRadius) var activeRect = bgRect
activeRect.size.width = CGFloat((Double(bgRect.size.width) / (self.maxValue - self.minValue)) * self.doubleValue)
let active = NSBezierPath(roundedRect: activeRect, xRadius: barRadius, yRadius: barRadius)
NSColor.darkGray.setFill() NSColor.darkGray.setFill()
active.fill() active.fill()
} }

3
MTMR/Widgets/InputSourceBarItem.swift
View File

@ -42,7 +42,8 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
} }
if (iconImage != nil) { if (iconImage != nil) {
self.button.image = iconImage self.button.imageScaling = .scaleProportionallyUpOrDown
self.button.cell?.image = iconImage
} else { } else {
self.button.title = currentSource.name self.button.title = currentSource.name
} }