Merge pull request #106 from tumblr/stories/scale-to-fill-rendering

Stories: Scale to fill rendering + post-export overlays bug fixes

Author: bjtitus

Classes/Editor/EditorView.swift

@@ -120,8 +120,11 @@ private struct EditorViewConstants {
 final class EditorView: UIView, MovableViewCanvasDelegate, MediaPlayerViewDelegate {
 
     func didRenderRectChange(rect: CGRect) {
-        drawingCanvasConstraints.update(with: rect)
-        movableViewCanvasConstraints.update(with: rect)
+        if playerView?.contentMode != .scaleToFill {
+            // When scaling to fill we don't need to update these views as they are already sized correctly.
+            drawingCanvasConstraints.update(with: rect)
+            movableViewCanvasConstraints.update(with: rect)
+        }
         delegate?.didRenderRectChange(rect: rect)
     }
 

Classes/Editor/MultiEditor/MultiEditorViewController.swift

@@ -374,6 +374,9 @@ extension MultiEditorViewController: EditorControllerDelegate {
                 editor.export { [weak self, editor] result in
                     let _ = editor // strong reference until the export completes
                     self?.exportHandler.handleExport(result, for: idx)
+                    if let selected = self?.selected {
+                        self?.loadEditor(for: selected)
+                    }
                 }
             }
         })

Kanvas.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "Kanvas"
-  spec.version      = "1.2.4"
+  spec.version      = "1.2.5"
   spec.summary      = "A custom camera built for iOS."
   spec.homepage     = "https://github.com/tumblr/kanvas-ios"
   spec.license      = "MPLv2"