From 8119dec8173eb64edefa79853b538d7b484a3f06 Mon Sep 17 00:00:00 2001 From: dungntm58 Date: Thu, 8 Nov 2018 09:26:50 +0700 Subject: [PATCH] Version 0.3.0 --- Example/RCStickerView/ViewController.swift | 9 +++++++-- RCStickerView.podspec | 2 +- RCStickerView/Classes/RCStickerView.swift | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Example/RCStickerView/ViewController.swift b/Example/RCStickerView/ViewController.swift index 382cf01..ee22dbe 100644 --- a/Example/RCStickerView/ViewController.swift +++ b/Example/RCStickerView/ViewController.swift @@ -14,11 +14,16 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + let container = UIView(frame: CGRect(x: 0, y: 0, width: 300, height: 400)) + self.view.addSubview(container) + container.backgroundColor = #colorLiteral(red: 0.501960814, green: 0.501960814, blue: 0.501960814, alpha: 1) + container.center = self.view.center + let testView = UIView(frame: CGRect(x: 0, y: 0, width: 150, height: 100)) testView.backgroundColor = .red let stickerView = RCStickerView(contentView: testView) - stickerView.center = self.view.center + stickerView.center = container.center stickerView.delegate = self stickerView.outlineBorderColor = .blue stickerView.set(image: UIImage(named: "Close"), for: .close) @@ -28,7 +33,7 @@ class ViewController: UIViewController { stickerView.handlerSize = 40 stickerView.movingMode = .insideSuperview(ignoreHandler: true) - self.view.addSubview(stickerView) + container.addSubview(stickerView) let testLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 100, height: 50)) testLabel.text = "Test Label" diff --git a/RCStickerView.podspec b/RCStickerView.podspec index 543a2a8..5dcb29a 100644 --- a/RCStickerView.podspec +++ b/RCStickerView.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'RCStickerView' - s.version = '0.2.0' + s.version = '0.3.0' s.summary = 'Add label, image, other custom view as a sticker view.' # This description is used to generate tags and improve search results. diff --git a/RCStickerView/Classes/RCStickerView.swift b/RCStickerView/Classes/RCStickerView.swift index 254f967..58c465b 100644 --- a/RCStickerView/Classes/RCStickerView.swift +++ b/RCStickerView/Classes/RCStickerView.swift @@ -568,16 +568,16 @@ private extension RCStickerView { var bottomPadding: CGFloat = 0 if ignoreHandler { if positionVisibilityMap[.topLeft]! || positionVisibilityMap[.topRight]! { - topPadding = _handleSize + topPadding = _handleSize - view.frame.origin.y } if positionVisibilityMap[.topLeft]! || positionVisibilityMap[.bottomLeft]! { - leftPadding = _handleSize + leftPadding = _handleSize - view.frame.origin.x } if positionVisibilityMap[.bottomRight]! || positionVisibilityMap[.topRight]! { - rightPadding = _handleSize + rightPadding = _handleSize + view.frame.origin.x } if positionVisibilityMap[.bottomRight]! || positionVisibilityMap[.bottomLeft]! { - bottomPadding = _handleSize + bottomPadding = _handleSize + view.frame.origin.y } }