From 5567c1174a4284e47e9112fd0571354153b3475a Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 2 Dec 2022 10:07:37 -0600 Subject: [PATCH] removed ui button default padding around UILabel Signed-off-by: Matt Bruce --- VDS/Components/Buttons/TextLink/TextLink.swift | 6 +++++- VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift index 0a9901c6..e3e1bf44 100644 --- a/VDS/Components/Buttons/TextLink/TextLink.swift +++ b/VDS/Components/Buttons/TextLink/TextLink.swift @@ -89,7 +89,11 @@ open class TextLink: ButtonBase { //-------------------------------------------------- // MARK: - Overrides - //-------------------------------------------------- + //-------------------------------------------------- + open override var intrinsicContentSize: CGSize { + return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize + } + open override func updateView() { //need to set the properties so the super class //can render out the label correctly diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift index 77c3261c..d0e5978e 100644 --- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift +++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift @@ -49,7 +49,7 @@ open class TextLinkCaret: ButtonBase { get{ _text } set { var updatedText = newValue ?? "" - updatedText = iconPosition == .right ? "\(updatedText) " : " \(updatedText)" + updatedText = iconPosition == .right ? "\(updatedText) " : " \(updatedText)" _text = updatedText didChange() } @@ -89,7 +89,7 @@ open class TextLinkCaret: ButtonBase { //-------------------------------------------------- open override func setup() { super.setup() - + let size = caretView.size!.dimensions() caretView.frame = .init(x: 0, y: 0, width: size.width, height: size.height) } @@ -103,7 +103,9 @@ open class TextLinkCaret: ButtonBase { // MARK: - Overrides //-------------------------------------------------- override open var intrinsicContentSize: CGSize { - let size = super.intrinsicContentSize + //get the labels size, if not the button + let size = titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize + var itemWidth = size.width if let caretWidth = caretView.size?.dimensions().width {