From 8760185ae7fa72502155fa78c674ae2c10645163 Mon Sep 17 00:00:00 2001 From: ad Date: Sun, 15 Apr 2018 12:38:07 +0300 Subject: [PATCH] * prevent crash on return from sleep (removed lockFocus/unlockFocus) --- MTMR/BrightnessViewController.swift | 4 ++++ MTMR/VolumeViewController.swift | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MTMR/BrightnessViewController.swift b/MTMR/BrightnessViewController.swift index 9c58898..fb6bc27 100644 --- a/MTMR/BrightnessViewController.swift +++ b/MTMR/BrightnessViewController.swift @@ -25,6 +25,10 @@ class BrightnessViewController: NSCustomTouchBarItem { required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } + + deinit { + sliderItem.unbind(NSBindingName.value) + } @objc func updateBrightnessSlider() { DispatchQueue.main.async { diff --git a/MTMR/VolumeViewController.swift b/MTMR/VolumeViewController.swift index 4de0b7e..30ab919 100644 --- a/MTMR/VolumeViewController.swift +++ b/MTMR/VolumeViewController.swift @@ -55,6 +55,10 @@ class VolumeViewController: NSCustomTouchBarItem { required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } + + deinit { + sliderItem.unbind(NSBindingName.value) + } @objc func sliderValueChanged(_ sender: Any) { if let sliderItem = sender as? NSSlider { @@ -139,15 +143,11 @@ class CustomSliderCell: NSSliderCell { _currentKnobRect = knobRect; drawBar(inside: _barRect, flipped: false) - self.controlView?.lockFocus() 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+3), from: NSRect(x: 0, y: 0, width: knobImage.size.width, height: knobImage.size.height), operation: NSCompositingOperation.sourceOver, fraction: 1) - - self.controlView?.unlockFocus() - } override func drawBar(inside aRect: NSRect, flipped: Bool) {