Merge branch 'mbruce/bugfix' into 'develop'
put last part in else See merge request BPHV_MIPS/vds_ios!272
This commit is contained in:
commit
be8de7fbca
@ -447,7 +447,7 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
|
||||
widthConstraint?.activate()
|
||||
aspectRatioConstraint = heightAnchor.constraint(equalTo: widthAnchor, multiplier: multiplier)
|
||||
aspectRatioConstraint?.activate()
|
||||
return
|
||||
|
||||
}
|
||||
//-------------------------------------------------------------------------
|
||||
//Height + AspectRatio Constraint - Will exit out if set
|
||||
@ -460,8 +460,8 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
|
||||
heightConstraint?.activate()
|
||||
aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: multiplier)
|
||||
aspectRatioConstraint?.activate()
|
||||
return
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
//Width Constraint
|
||||
@ -481,6 +481,7 @@ open class TileContainerBase<PaddingType: DefaultValuing>: Control where Padding
|
||||
heightConstraint?.activate()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// This is the size of the superview's allowed space for this container first by constrained size which would include padding/inset values an
|
||||
private var superviewWidth: CGFloat? {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user