From 87eb556d95a1bf87e15abec0740c77772a326c6f Mon Sep 17 00:00:00 2001 From: yongjun Date: Wed, 10 Nov 2021 18:01:37 +0900 Subject: [PATCH 1/2] Add arrowPading --- Sources/EasyTipView/EasyTipView.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Sources/EasyTipView/EasyTipView.swift b/Sources/EasyTipView/EasyTipView.swift index 3d3e1bed..3a29d7bd 100644 --- a/Sources/EasyTipView/EasyTipView.swift +++ b/Sources/EasyTipView/EasyTipView.swift @@ -227,6 +227,7 @@ open class EasyTipView: UIView { public var foregroundColor = UIColor.white public var backgroundColor = UIColor.red public var arrowPosition = ArrowPosition.any + public var arrowPading = CGFloat(0) public var textAlignment = NSTextAlignment.center public var borderWidth = CGFloat(0) public var borderColor = UIColor.clear @@ -441,16 +442,16 @@ open class EasyTipView: UIView { switch position { case .top, .any: xOrigin = refViewFrame.center.x - tipViewSize.width / 2 - yOrigin = refViewFrame.y + refViewFrame.height + yOrigin = refViewFrame.y + refViewFrame.height + preferences.drawing.arrowPading case .bottom: xOrigin = refViewFrame.center.x - tipViewSize.width / 2 - yOrigin = refViewFrame.y - tipViewSize.height + yOrigin = refViewFrame.y - tipViewSize.height - preferences.drawing.arrowPading case .right: xOrigin = refViewFrame.x - tipViewSize.width - yOrigin = refViewFrame.center.y - tipViewSize.height / 2 + yOrigin = refViewFrame.center.y - tipViewSize.height / 2 + preferences.drawing.arrowPading case .left: xOrigin = refViewFrame.x + refViewFrame.width - yOrigin = refViewFrame.center.y - tipViewSize.height / 2 + yOrigin = refViewFrame.center.y - tipViewSize.height / 2 - preferences.drawing.arrowPading } var frame = CGRect(x: xOrigin, y: yOrigin, width: tipViewSize.width, height: tipViewSize.height) From 6eb81a45d2a91d42b405c14e516236dc9cefe045 Mon Sep 17 00:00:00 2001 From: yongjun Date: Wed, 10 Nov 2021 18:04:45 +0900 Subject: [PATCH 2/2] Rename arrowPading to arrowPadding --- Sources/EasyTipView/EasyTipView.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/EasyTipView/EasyTipView.swift b/Sources/EasyTipView/EasyTipView.swift index 3a29d7bd..d3ed56be 100644 --- a/Sources/EasyTipView/EasyTipView.swift +++ b/Sources/EasyTipView/EasyTipView.swift @@ -227,7 +227,7 @@ open class EasyTipView: UIView { public var foregroundColor = UIColor.white public var backgroundColor = UIColor.red public var arrowPosition = ArrowPosition.any - public var arrowPading = CGFloat(0) + public var arrowPadding = CGFloat(0) public var textAlignment = NSTextAlignment.center public var borderWidth = CGFloat(0) public var borderColor = UIColor.clear @@ -442,16 +442,16 @@ open class EasyTipView: UIView { switch position { case .top, .any: xOrigin = refViewFrame.center.x - tipViewSize.width / 2 - yOrigin = refViewFrame.y + refViewFrame.height + preferences.drawing.arrowPading + yOrigin = refViewFrame.y + refViewFrame.height + preferences.drawing.arrowPadding case .bottom: xOrigin = refViewFrame.center.x - tipViewSize.width / 2 - yOrigin = refViewFrame.y - tipViewSize.height - preferences.drawing.arrowPading + yOrigin = refViewFrame.y - tipViewSize.height - preferences.drawing.arrowPadding case .right: xOrigin = refViewFrame.x - tipViewSize.width - yOrigin = refViewFrame.center.y - tipViewSize.height / 2 + preferences.drawing.arrowPading + yOrigin = refViewFrame.center.y - tipViewSize.height / 2 + preferences.drawing.arrowPadding case .left: xOrigin = refViewFrame.x + refViewFrame.width - yOrigin = refViewFrame.center.y - tipViewSize.height / 2 - preferences.drawing.arrowPading + yOrigin = refViewFrame.center.y - tipViewSize.height / 2 - preferences.drawing.arrowPadding } var frame = CGRect(x: xOrigin, y: yOrigin, width: tipViewSize.width, height: tipViewSize.height)