From ddbef4e3111b2ba921fad8fe2f2dea28aef12cf9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:56:52 -0500 Subject: [PATCH] Respond to CR. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 11 +++++++---- .../ImageEditor/ImageEditorTextViewController.swift | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 7a4e7b637..886adf2c7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -29,6 +29,11 @@ public class ImageEditorCanvasView: UIView { private let itemIdsToIgnore: [String] + // We want strokes to be rendered above the image and behind text. + private static let brushLayerZ: CGFloat = +1 + // We want text to be rendered above the image and strokes. + private static let textLayerZ: CGFloat = +2 + @objc public required init(model: ImageEditorModel, itemIdsToIgnore: [String] = []) { @@ -461,8 +466,7 @@ public class ImageEditorCanvasView: UIView { shapeLayer.fillColor = nil shapeLayer.lineCap = kCALineCapRound shapeLayer.lineJoin = kCALineJoinRound - // We want strokes to be rendered above the image and behind text. - shapeLayer.zPosition = 1 + shapeLayer.zPosition = brushLayerZ return shapeLayer } @@ -524,8 +528,7 @@ public class ImageEditorCanvasView: UIView { let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) layer.setAffineTransform(transform) - // We want text to be rendered above the image and strokes. - layer.zPosition = 2 + layer.zPosition = textLayerZ return layer } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 3a04ac443..8292582de 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -180,7 +180,6 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel }) configureTextView() - textView.addRedBorder() self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20)