From dff9ec1eefd555590d79a99aacd7952eb085ce8d Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 13 Feb 2023 15:47:58 -0600 Subject: [PATCH 1/2] remvoed bug of initialSetup being called were not needed Signed-off-by: Matt Bruce --- VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift | 3 --- VDS/Components/TileContainer/TileContainer.swift | 3 --- VDS/Components/Tilelet/Tilelet.swift | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift index 1bc28dba..29e40432 100644 --- a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift +++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift @@ -119,17 +119,14 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega //-------------------------------------------------- required public init() { super.init(frame: .zero) - initialSetup() } public override init(frame: CGRect) { super.init(frame: .zero) - initialSetup() } public required init?(coder: NSCoder) { super.init(coder: coder) - initialSetup() } //-------------------------------------------------- // MARK: - Public Functions diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index c49e7235..0e52441a 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -18,17 +18,14 @@ open class TileContainer: Control { //-------------------------------------------------- required public init() { super.init(frame: .zero) - initialSetup() } public override init(frame: CGRect) { super.init(frame: .zero) - initialSetup() } public required init?(coder: NSCoder) { super.init(coder: coder) - initialSetup() } //-------------------------------------------------- diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index 3fcddb37..7a214388 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -25,18 +25,16 @@ open class Tilelet: TileContainer { //-------------------------------------------------- required public init() { super.init(frame: .zero) - initialSetup() } public override init(frame: CGRect) { super.init(frame: .zero) - initialSetup() } public required init?(coder: NSCoder) { super.init(coder: coder) - initialSetup() } + //-------------------------------------------------- // MARK: - Private Properties //-------------------------------------------------- From 37346b1f65fe8fd3e34f9710b89251d7697dc721 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 14 Feb 2023 08:32:30 -0600 Subject: [PATCH 2/2] turn off userinteractive Signed-off-by: Matt Bruce --- VDS/Components/TileContainer/TileContainer.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index 0e52441a..ec996019 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -79,9 +79,13 @@ open class TileContainer: Control { //-------------------------------------------------- public var backgroundImage: UIImage? { didSet{ didChange() } } - public var containerView = View() + public var containerView = View().with { + $0.isUserInteractionEnabled = false + } - public var highlightView = View() + public var highlightView = View().with { + $0.isUserInteractionEnabled = false + } public var color: BackgroundColor = .white { didSet{ didChange() } }