mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/tilet' into 'develop'

Browse Source 
Fixed touch bugs in Tilelet

See merge request BPHV_MIPS/vds_ios!39
This commit is contained in:
Bruce, Matt R 2023-02-14 14:49:41 +00:00
commit 65a4c994cf
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift
View File

@ -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

11
VDS/Components/TileContainer/TileContainer.swift
View File

@ -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()
}
//--------------------------------------------------
@ -82,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() } }

4
VDS/Components/Tilelet/Tilelet.swift
View File

@ -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
//--------------------------------------------------