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

Merge branch 'mbruce/bugfix' into 'develop'

Browse Source 
put last part in else

See merge request BPHV_MIPS/vds_ios!272
This commit is contained in:
Bruce, Matt R 2024-07-19 17:28:42 +00:00
commit be8de7fbca
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,7 +447,7 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
widthConstraint?.activate() widthConstraint?.activate()
aspectRatioConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: multiplier) aspectRatioConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: multiplier)
aspectRatioConstraint?.activate() aspectRatioConstraint?.activate()
return
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//Height + AspectRatio Constraint - Will exit out if set //Height + AspectRatio Constraint - Will exit out if set
@ -460,25 +460,26 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
heightConstraint?.activate() heightConstraint?.activate()
aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: multiplier) aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: multiplier)
aspectRatioConstraint?.activate() aspectRatioConstraint?.activate()
return
}
//------------------------------------------------------------------------- } else {
//Width Constraint
//-------------------------------------------------------------------------
if let containerViewWidth,
containerViewWidth > 0 {
widthConstraint?.constant = containerViewWidth
widthConstraint?.activate()
}
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//Height Constraint //Width Constraint
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
if let containerViewHeight, if let containerViewWidth,
containerViewHeight > 0 { containerViewWidth > 0 {
heightConstraint?.constant = containerViewHeight widthConstraint?.constant = containerViewWidth
heightConstraint?.activate() widthConstraint?.activate()
}
//-------------------------------------------------------------------------
//Height Constraint
//-------------------------------------------------------------------------
if let containerViewHeight,
containerViewHeight > 0 {
heightConstraint?.constant = containerViewHeight
heightConstraint?.activate()
}
} }
} }