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

* image can be set for slider

Browse Source
This commit is contained in:
ad 2018-04-14 13:04:46 +03:00
parent 3f2dad52ee
commit 37c2e8523c
4 changed files with 88 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MTMR/BrightnessViewController.swift
View File

@ -4,16 +4,17 @@ import AVFoundation
import CoreAudio
class BrightnessViewController: NSCustomTouchBarItem {
private(set) var sliderItem: NSSlider!
private(set) var sliderItem: CustomSlider!
init(identifier: NSTouchBarItem.Identifier, refreshInterval: Double, image: NSImage? = nil) {
super.init(identifier: identifier)
let brightness:Double = Double(getBrightness())
sliderItem = NSSlider(value: brightness*100.0, minValue: 0.0, maxValue: 100.0, target: self, action:#selector(BrightnessViewController.sliderValueChanged(_:)))
if (image != nil) {
sliderItem.cell = CustomSliderCell(knob: image!)
}
sliderItem = CustomSlider(knob: image!)
sliderItem.target = self
sliderItem.action = #selector(BrightnessViewController.sliderValueChanged(_:))
sliderItem.minValue = 0.0
sliderItem.maxValue = 100.0
sliderItem.floatValue = getBrightness()*100
self.view = sliderItem

17
MTMR/ItemsParsing.swift
View File

@ -80,11 +80,24 @@ class SupportedTypesHolder {
let item = ItemType.appleScriptTitledButton(source: Source(filePath: scriptPath), refreshInterval: interval ?? 1800.0)
return (item: item, action: .none, parameters: [:])
},
"volume": { decoder in
enum CodingKeys: String, CodingKey { case image }
let container = try decoder.container(keyedBy: CodingKeys.self)
if var img = try container.decodeIfPresent(Source.self, forKey: .image) {
return (item: .volume(), action: .none, parameters: [.image: .image(source: img)])
} else {
return (item: .volume(), action: .none, parameters: [:])
}
},
"brightness": { decoder in
enum CodingKeys: String, CodingKey { case refreshInterval }
enum CodingKeys: String, CodingKey { case refreshInterval; case image }
let container = try decoder.container(keyedBy: CodingKeys.self)
let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, parameters: [:])
if var img = try container.decodeIfPresent(Source.self, forKey: .image) {
return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, parameters: [.image: .image(source: img)])
} else {
return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, parameters: [:])
}
},
"battery": { decoder in
enum CodingKeys: String, CodingKey { case refreshInterval }

14
MTMR/TouchBarController.swift
View File

@ -96,7 +96,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
}
}
func setupControlStripPresence() {
@objc func setupControlStripPresence() {
DFRSystemModalShowsCloseBoxWhenFrontMost(false)
let item = NSCustomTouchBarItem(identifier: .controlStripItem)
item.view = NSButton(image: #imageLiteral(resourceName: "Strip"), target: self, action: #selector(presentTouchBar))
@ -141,9 +141,17 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
case .timeButton(formatTemplate: let template):
barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template)
case .volume:
barItem = VolumeViewController(identifier: identifier)
if case .image(let source)? = item.additionalParameters[.image] {
barItem = VolumeViewController(identifier: identifier, image: source.image)
} else {
barItem = VolumeViewController(identifier: identifier)
}
case .brightness(refreshInterval: let interval):
barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
if case .image(let source)? = item.additionalParameters[.image] {
barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval, image: source.image)
} else {
barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
}
}
if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
widthBarItem.setWidth(value: value)

71
MTMR/VolumeViewController.swift
View File

@ -4,18 +4,10 @@ import AVFoundation
import CoreAudio
class VolumeViewController: NSCustomTouchBarItem {
private(set) var sliderItem: NSSlider!
private(set) var sliderItem: CustomSlider!
init(identifier: NSTouchBarItem.Identifier, image: NSImage? = nil) {
super.init(identifier: identifier)
let volume:Double = Double(getInputGain())
sliderItem = NSSlider(value: volume*100, minValue: 0.0, maxValue: 100.0, target: self, action:#selector(VolumeViewController.sliderValueChanged(_:)))
if (image != nil) {
sliderItem.cell = CustomSliderCell(knob: image!)
}
self.view = sliderItem
var forPropertyAddress = AudioObjectPropertyAddress(
mSelector: kAudioHardwareServiceDeviceProperty_VirtualMasterVolume,
@ -25,6 +17,15 @@ class VolumeViewController: NSCustomTouchBarItem {
addListenerBlock(listenerBlock: audioObjectPropertyListenerBlock,
onAudioObjectID: defaultDeviceID,
forPropertyAddress: &forPropertyAddress)
sliderItem = CustomSlider(knob: image!)
sliderItem.target = self
sliderItem.action = #selector(VolumeViewController.sliderValueChanged(_:))
sliderItem.minValue = 0.0
sliderItem.maxValue = 100.0
sliderItem.floatValue = getInputGain()*100
self.view = sliderItem
}
func addListenerBlock( listenerBlock: @escaping AudioObjectPropertyListenerBlock, onAudioObjectID: AudioObjectID, forPropertyAddress: UnsafePointer<AudioObjectPropertyAddress>) {
@ -137,16 +138,13 @@ class CustomSliderCell: NSSliderCell {
}
_currentKnobRect = knobRect;
drawBar(inside: _barRect, flipped: true)
drawBar(inside: _barRect, flipped: false)
self.controlView?.lockFocus()
knobImage.size.width = knobRect.size.width
knobImage.size.height = knobRect.size.height
let newOriginX:CGFloat = knobRect.origin.x *
(_barRect.size.width - (knobImage.size.width - knobRect.size.width)) / _barRect.size.width;
knobImage.draw(at: NSPoint(x: newOriginX, y: knobRect.origin.y), from: NSRect(x: 0, y: 0, width: knobImage.size.width, height: knobImage.size.height), operation: NSCompositingOperation.sourceOver, fraction: 1)
knobImage.draw(at: NSPoint(x: newOriginX, y: knobRect.origin.y+3), from: NSRect(x: 0, y: 0, width: knobImage.size.width, height: knobImage.size.height), operation: NSCompositingOperation.sourceOver, fraction: 1)
self.controlView?.unlockFocus()
@ -157,9 +155,10 @@ class CustomSliderCell: NSSliderCell {
var rect = aRect
rect.size.height = CGFloat(3)
let barRadius = CGFloat(2.5)
let barRadius = CGFloat(3)
let value = CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 8))
let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 12))
var leftRect = rect
leftRect.size.width = finalWidth
let bg = NSBezierPath(roundedRect: rect, xRadius: barRadius, yRadius: barRadius)
@ -170,3 +169,43 @@ class CustomSliderCell: NSSliderCell {
active.fill()
}
}
class CustomSlider:NSSlider {
var currentValue:CGFloat = 0
override func setNeedsDisplay(_ invalidRect: NSRect) {
super.setNeedsDisplay(invalidRect)
}
override func awakeFromNib() {
super.awakeFromNib()
if ((self.cell?.isKind(of: CustomSliderCell.self)) == false) {
let cell:CustomSliderCell = CustomSliderCell()
self.cell = cell
}
}
convenience init(knob:NSImage) {
self.init()
self.cell = CustomSliderCell(knob: knob)
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(frame frameRect: NSRect) {
super.init(frame: frameRect)
}
func knobImage() -> NSImage {
let cell = self.cell as! CustomSliderCell
return cell.knobImage
}
func setKnobImage(image:NSImage) {
let cell = self.cell as! CustomSliderCell
cell.knobImage = image
}
}