Skip to content
This repository was archived by the owner on Jul 20, 2023. It is now read-only.

Fix tipViewSize and bubble height with left/right arrow positions #235

Open
mokai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix tipViewSize and bubble height with left/right arrow positions #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Sources/EasyTipView/EasyTipView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,18 @@ open class EasyTipView: UIView {

[unowned self] in

var tipViewSize =
CGSize(
width: self.contentSize.width + self.preferences.positioning.contentInsets.left + self.preferences.positioning.contentInsets.right + self.preferences.positioning.bubbleInsets.left + self.preferences.positioning.bubbleInsets.right,
height: self.contentSize.height + self.preferences.positioning.contentInsets.top + self.preferences.positioning.contentInsets.bottom + self.preferences.positioning.bubbleInsets.top + self.preferences.positioning.bubbleInsets.bottom + self.preferences.drawing.arrowHeight)

return tipViewSize
let arrowPosition = preferences.drawing.arrowPosition
let width: CGFloat
let height: CGFloat
switch arrowPosition {
case .left, .right:
width = self.contentSize.width + self.preferences.positioning.contentInsets.left + self.preferences.positioning.contentInsets.right + self.preferences.positioning.bubbleInsets.left + self.preferences.positioning.bubbleInsets.right + self.preferences.drawing.arrowHeight
height = self.contentSize.height + self.preferences.positioning.contentInsets.top + self.preferences.positioning.contentInsets.bottom + self.preferences.positioning.bubbleInsets.top + self.preferences.positioning.bubbleInsets.bottom
default:
width = self.contentSize.width + self.preferences.positioning.contentInsets.left + self.preferences.positioning.contentInsets.right + self.preferences.positioning.bubbleInsets.left + self.preferences.positioning.bubbleInsets.right
height = self.contentSize.height + self.preferences.positioning.contentInsets.top + self.preferences.positioning.contentInsets.bottom + self.preferences.positioning.bubbleInsets.top + self.preferences.positioning.bubbleInsets.bottom + self.preferences.drawing.arrowHeight
}
return CGSize(width: width, height: height)
}()

// MARK: - Static variables -
Expand Down Expand Up @@ -720,7 +726,7 @@ open class EasyTipView: UIView {
case .left, .right:

bubbleWidth = tipViewSize.width - preferences.positioning.bubbleInsets.left - preferences.positioning.bubbleInsets.right - preferences.drawing.arrowHeight
bubbleHeight = tipViewSize.height - preferences.positioning.bubbleInsets.top - preferences.positioning.bubbleInsets.left
bubbleHeight = tipViewSize.height - preferences.positioning.bubbleInsets.top - preferences.positioning.bubbleInsets.bottom

bubbleXOrigin = arrowPosition == .right ? preferences.positioning.bubbleInsets.left : preferences.positioning.bubbleInsets.left + preferences.drawing.arrowHeight
bubbleYOrigin = preferences.positioning.bubbleInsets.top
Expand Down