coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Fix cycle retain of EditorTextView

Browse Source
This commit is contained in:
1024jp 2018-06-02 14:01:47 +09:00
parent 58f958fb6d
commit 98c4969fca
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -2,6 +2,15 @@
Change Log
==========================
unreleased
--------------------------
### Fixes
- Fix general stability.
3.4.1 (253)
--------------------------

25
CotEditor/Sources/TextSizeTouchBar.swift
View File

@ -39,7 +39,7 @@ final class TextSizeTouchBar: NSTouchBar, NSTouchBarDelegate, NSUserInterfaceVal
// MARK: Private Properties
private let textView: NSTextView
private weak var textContainer: NSTextContainer? // hold textContainer instead of textView, which cannot be weak
@ -48,7 +48,7 @@ final class TextSizeTouchBar: NSTouchBar, NSTouchBarDelegate, NSUserInterfaceVal
init(textView: NSTextView, forPressAndHold: Bool = false) {
self.textView = textView
self.textContainer = textView.textContainer
super.init()
@ -80,10 +80,12 @@ final class TextSizeTouchBar: NSTouchBar, NSTouchBarDelegate, NSUserInterfaceVal
return item
case .textSizeSlider:
guard let textView = self.textView else { return nil }
let item = NSSliderTouchBarItem(identifier: identifier)
item.slider.doubleValue = Double(self.textView.scale)
item.slider.maxValue = Double(self.textView.enclosingScrollView?.maxMagnification ?? 5.0)
item.slider.minValue = Double(self.textView.enclosingScrollView?.minMagnification ?? 0.2)
item.slider.doubleValue = Double(textView.scale)
item.slider.maxValue = Double(textView.enclosingScrollView?.maxMagnification ?? 5.0)
item.slider.minValue = Double(textView.enclosingScrollView?.minMagnification ?? 0.2)
item.minimumValueAccessory = NSSliderAccessory(image: #imageLiteral(resourceName: "SmallTextSizeTemplate"))
item.maximumValueAccessory = NSSliderAccessory(image: #imageLiteral(resourceName: "LargeTextSizeTemplate"))
item.target = self
@ -110,7 +112,7 @@ final class TextSizeTouchBar: NSTouchBar, NSTouchBarDelegate, NSUserInterfaceVal
switch action {
case #selector(resetTextSize(_:)):
return (self.textView.scale != 1.0)
return (self.textView?.scale != 1.0)
default:
return true
@ -126,26 +128,31 @@ final class TextSizeTouchBar: NSTouchBar, NSTouchBarDelegate, NSUserInterfaceVal
let scale = CGFloat(sliderItem.slider.doubleValue)
self.textView.setScaleKeepingVisibleArea(scale)
self.textView?.setScaleKeepingVisibleArea(scale)
}
/// "Actaul Size" button was pressed
@IBAction func resetTextSize(_ sender: Any?) {
self.textView.setScaleKeepingVisibleArea(1.0)
self.textView?.setScaleKeepingVisibleArea(1.0)
}
// MARK: Private Methods
private var textView: NSTextView? {
return self.textContainer?.textView
}
/// validate text size slider in touch bar
@objc private func invalidateSlider(_ notification: Notification) {
guard let item = self.item(forIdentifier: .textSizeSlider) as? NSSliderTouchBarItem else { return }
item.slider.doubleValue = Double(self.textView.scale)
item.slider.doubleValue = Double(self.textView?.scale ?? 1.0)
}
}