exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-08-15 08:00:31 +03:00
Code Issues Projects Releases Wiki Activity

Fixed retain cycle between MacawView and MacawZoom

Browse Source
This commit is contained in:
Anton Poltoratskyi 2020-07-13 21:35:46 +03:00
parent cfb97d6f73
commit 2181401dbb
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/views/MacawView.swift
View File

@ -15,7 +15,7 @@ open class MacawView: MView, MGestureRecognizerDelegate {
internal var drawingView = DrawingView()
public let zoom = MacawZoom()
public lazy var zoom = MacawZoom(view: self)
open var node: Node {
get { return drawingView.node }
@ -77,7 +77,7 @@ open class MacawView: MView, MGestureRecognizerDelegate {
self.node = node
self.renderer = RenderUtils.createNodeRenderer(node, view: drawingView)
zoom.initialize(view: self, onChange: onZoomChange)
zoom.initialize(onChange: onZoomChange)
initializeView()
}
@ -91,7 +91,7 @@ open class MacawView: MView, MGestureRecognizerDelegate {
public override init(frame: CGRect) {
super.init(frame: frame)
zoom.initialize(view: self, onChange: onZoomChange)
zoom.initialize(onChange: onZoomChange)
initializeView()
}

15
Source/views/MacawZoom.swift
View File

@ -16,14 +16,18 @@ import AppKit
open class MacawZoom {
private var view: MacawView!
private var onChange: ((Transform) -> Void)!
private unowned let view: MacawView
private var onChange: ((Transform) -> Void)?
private var touches = [TouchData]()
private var zoomData = ZoomData()
private var trackMove = false
private var trackScale = false
private var trackRotate = false
init(view: MacawView) {
self.view = view
}
open func enable(move: Bool = true, scale: Bool = true, rotate: Bool = false) {
trackMove = move
@ -47,11 +51,10 @@ open class MacawZoom {
let s = scale ?? zoomData.scale
let a = angle ?? zoomData.angle
zoomData = ZoomData(offset: o, scale: s, angle: a)
onChange(zoomData.transform())
onChange?(zoomData.transform())
}
func initialize(view: MacawView, onChange: @escaping ((Transform) -> Void)) {
self.view = view
func initialize(onChange: @escaping (Transform) -> Void) {
self.onChange = onChange
}
@ -63,7 +66,7 @@ open class MacawZoom {
func touchesMoved(_ touches: Set<MTouch>) {
let zoom = cleanTouches() ?? getNewZoom()
onChange(zoom.transform())
onChange?(zoom.transform())
}
func touchesEnded(_ touches: Set<MTouch>) {