From 35b6f6cf12c8642a7cdc342ec34a7d961f646497 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 19 Dec 2018 15:08:28 -0500 Subject: [PATCH] Respond to CR. --- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 5 +++++ SignalMessaging/Views/ImageEditor/ImageEditorView.swift | 2 +- SignalMessaging/utils/OWSMath.h | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 2add9675b..d77707d26 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -340,8 +340,13 @@ private class ImageEditorOperation: NSObject { @objc public protocol ImageEditorModelDelegate: class { + // Used for large changes to the model, when the entire + // model should be reloaded. func imageEditorModelDidChange(before: ImageEditorContents, after: ImageEditorContents) + + // Used for small narrow changes to the model, usually + // to a single item. func imageEditorModelDidChange(changedItemIds: [String]) } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 6cca0cf63..bc702edab 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -196,7 +196,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { case .brush: handleBrushGesture(gestureRecognizer) case .crop: - handleCropGesture(gestureRecognizer) + handleCropGesture(gestureRecognizer) } } diff --git a/SignalMessaging/utils/OWSMath.h b/SignalMessaging/utils/OWSMath.h index 6bdfaa617..d159c9f36 100644 --- a/SignalMessaging/utils/OWSMath.h +++ b/SignalMessaging/utils/OWSMath.h @@ -4,7 +4,6 @@ NS_ASSUME_NONNULL_BEGIN -// TODO: We'll eventually want to promote these into an OWSMath.h header. CG_INLINE CGFloat CGFloatClamp(CGFloat value, CGFloat minValue, CGFloat maxValue) { return MAX(minValue, MIN(maxValue, value));