keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix translation in all of editor view's gestures.

Browse Source
pull/2/head
Matthew Chen 6 years ago
parent 674cf2e01f
commit 7130895e3f
3 changed files with 53 additions and 72 deletions
Show Stats Download Patch File Download Diff File

35
SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift
Unescape Escape View File

@ -531,41 +531,6 @@ public class ImageEditorCanvasView: UIView {
return result return result
} }
// MARK: - Coordinates
public func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer,
transform: ImageEditorTransform) -> CGPoint {
return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer,
view: self.clipView,
transform: transform)
}
public class func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer,
view: UIView,
transform: ImageEditorTransform) -> CGPoint {
let locationInView = gestureRecognizer.location(in: view)
return locationUnit(forLocationInView: locationInView,
viewBounds: view.bounds,
transform: transform)
}
public func locationUnit(forLocationInView locationInView: CGPoint,
transform: ImageEditorTransform) -> CGPoint {
let viewBounds = self.clipView.bounds
return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView,
viewBounds: viewBounds,
transform: transform)
}
public class func locationUnit(forLocationInView locationInView: CGPoint,
viewBounds: CGRect,
transform: ImageEditorTransform) -> CGPoint {
let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size)
let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center)
let locationUnit = locationInContent.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false)
return locationUnit
}
// MARK: - Actions // MARK: - Actions
// Returns nil on error. // Returns nil on error.

12
SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift
Unescape Escape View File

@ -588,18 +588,6 @@ class ImageEditorCropViewController: OWSViewController {
} }
} }
// MARK: - Coordinates
private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer,
transform: ImageEditorTransform) -> CGPoint {
return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer, view: clipView, transform: transform)
}
private func locationUnit(forLocationInView locationInView: CGPoint,
transform: ImageEditorTransform) -> CGPoint {
return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, viewSize: clipView.bounds.size, transform: transform)
}
// MARK: - Events // MARK: - Events
@objc public func didTapBackButton() { @objc public func didTapBackButton() {

78
SignalMessaging/Views/ImageEditor/ImageEditorView.swift
Unescape Escape View File

@ -299,7 +299,7 @@ public class ImageEditorView: UIView {
} }
let location = gestureRecognizer.location(in: canvasView.gestureReferenceView) let location = gestureRecognizer.location(in: canvasView.gestureReferenceView)
guard let textLayer = canvasView.textLayer(forLocation: location) else { guard let textLayer = self.textLayer(forLocation: location) else {
return return
} }
@ -326,7 +326,7 @@ public class ImageEditorView: UIView {
switch gestureRecognizer.state { switch gestureRecognizer.state {
case .began: case .began:
let pinchState = gestureRecognizer.pinchStateStart let pinchState = gestureRecognizer.pinchStateStart
guard let textLayer = canvasView.textLayer(forLocation: pinchState.centroid) else { guard let textLayer = self.textLayer(forLocation: pinchState.centroid) else {
// The pinch needs to start centered on a text item. // The pinch needs to start centered on a text item.
return return
} }
@ -341,14 +341,20 @@ public class ImageEditorView: UIView {
return return
} }
let view = self.canvasView.gestureReferenceView
let viewBounds = view.bounds
let locationStart = gestureRecognizer.pinchStateStart.centroid let locationStart = gestureRecognizer.pinchStateStart.centroid
let locationUnitStart = locationUnit(forLocationInView: locationStart, transform: model.currentTransform())
let locationNow = gestureRecognizer.pinchStateLast.centroid let locationNow = gestureRecognizer.pinchStateLast.centroid
let locationUnitNow = locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart,
viewBounds: viewBounds,
let unitLocationDelta = CGPointSubtract(locationUnitNow, model: self.model,
locationUnitStart) transform: self.model.currentTransform())
let unitCenter = CGPointClamp01(CGPointAdd(textItem.unitCenter, unitLocationDelta)) let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationNow,
viewBounds: viewBounds,
model: self.model,
transform: self.model.currentTransform())
let gestureDeltaImageUnit = gestureNowImageUnit.minus(gestureStartImageUnit)
let unitCenter = CGPointClamp01(textItem.unitCenter.plus(gestureDeltaImageUnit))
// NOTE: We use max(1, ...) to avoid divide-by-zero. // NOTE: We use max(1, ...) to avoid divide-by-zero.
let newScaling = CGFloatClamp(textItem.scaling * gestureRecognizer.pinchStateLast.distance / max(1.0, gestureRecognizer.pinchStateStart.distance), let newScaling = CGFloatClamp(textItem.scaling * gestureRecognizer.pinchStateLast.distance / max(1.0, gestureRecognizer.pinchStateStart.distance),
@ -383,6 +389,13 @@ public class ImageEditorView: UIView {
private var movingTextStartUnitCenter: CGPoint? private var movingTextStartUnitCenter: CGPoint?
private var movingTextHasMoved = false private var movingTextHasMoved = false
private func textLayer(forLocation locationInView: CGPoint) -> EditorTextLayer? {
let viewBounds = self.canvasView.gestureReferenceView.bounds
let affineTransform = self.model.currentTransform().affineTransform(viewSize: viewBounds.size)
let locationInCanvas = locationInView.minus(viewBounds.center).applyingInverse(affineTransform).plus(viewBounds.center)
return canvasView.textLayer(forLocation: locationInCanvas)
}
@objc @objc
public func handleMoveTextGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { public func handleMoveTextGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) {
AssertIsOnMainThread() AssertIsOnMainThread()
@ -395,7 +408,7 @@ public class ImageEditorView: UIView {
owsFailDebug("Missing locationStart.") owsFailDebug("Missing locationStart.")
return return
} }
guard let textLayer = canvasView.textLayer(forLocation: locationStart) else { guard let textLayer = self.textLayer(forLocation: locationStart) else {
owsFailDebug("No text layer") owsFailDebug("No text layer")
return return
} }
@ -420,12 +433,19 @@ public class ImageEditorView: UIView {
return return
} }
let locationUnitStart = canvasView.locationUnit(forLocationInView: locationStart, transform: model.currentTransform()) let view = self.canvasView.gestureReferenceView
let locationNow = gestureRecognizer.location(in: canvasView.gestureReferenceView) let viewBounds = view.bounds
let locationUnitNow = canvasView.locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) let locationInView = gestureRecognizer.location(in: view)
let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart,
let unitLocationDelta = CGPointSubtract(locationUnitNow, locationUnitStart) viewBounds: viewBounds,
let unitCenter = CGPointClamp01(CGPointAdd(movingTextStartUnitCenter, unitLocationDelta)) model: self.model,
transform: self.model.currentTransform())
let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationInView,
viewBounds: viewBounds,
model: self.model,
transform: self.model.currentTransform())
let gestureDeltaImageUnit = gestureNowImageUnit.minus(gestureStartImageUnit)
let unitCenter = CGPointClamp01(movingTextStartUnitCenter.plus(gestureDeltaImageUnit))
let newItem = textItem.copy(withUnitCenter: unitCenter) let newItem = textItem.copy(withUnitCenter: unitCenter)
if movingTextHasMoved { if movingTextHasMoved {
@ -461,7 +481,14 @@ public class ImageEditorView: UIView {
self.currentStrokeSamples.removeAll() self.currentStrokeSamples.removeAll()
} }
let tryToAppendStrokeSample = { let tryToAppendStrokeSample = {
let newSample = self.locationUnit(forGestureRecognizer: gestureRecognizer, transform: self.model.currentTransform()) let view = self.canvasView.gestureReferenceView
let viewBounds = view.bounds
let locationInView = gestureRecognizer.location(in: view)
let newSample = ImageEditorView.locationImageUnit(forLocationInView: locationInView,
viewBounds: viewBounds,
model: self.model,
transform: self.model.currentTransform())
if let prevSample = self.currentStrokeSamples.last, if let prevSample = self.currentStrokeSamples.last,
prevSample == newSample { prevSample == newSample {
// Ignore duplicate samples. // Ignore duplicate samples.
@ -511,14 +538,15 @@ public class ImageEditorView: UIView {
// MARK: - Coordinates // MARK: - Coordinates
private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, private class func locationImageUnit(forLocationInView locationInView: CGPoint,
transform: ImageEditorTransform) -> CGPoint { viewBounds: CGRect,
return canvasView.locationUnit(forGestureRecognizer: gestureRecognizer, transform: transform) model: ImageEditorModel,
} transform: ImageEditorTransform) -> CGPoint {
let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: model.srcImageSizePixels, transform: transform)
private func locationUnit(forLocationInView locationInView: CGPoint, let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size)
transform: ImageEditorTransform) -> CGPoint { let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center)
return canvasView.locationUnit(forLocationInView: locationInView, transform: transform) let locationImageUnit = locationInContent.toUnitCoordinates(viewBounds: imageFrame, shouldClamp: false)
return locationImageUnit
} }
// MARK: - Edit Text Tool // MARK: - Edit Text Tool
@ -586,7 +614,7 @@ extension ImageEditorView: UIGestureRecognizerDelegate {
} }
let location = touch.location(in: canvasView.gestureReferenceView) let location = touch.location(in: canvasView.gestureReferenceView)
let isInTextArea = canvasView.textLayer(forLocation: location) != nil let isInTextArea = self.textLayer(forLocation: location) != nil
return isInTextArea return isInTextArea
} }
} }

Write Preview
Loading…
Cancel
Save