Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios.git into mbruce/bugfix

This commit is contained in:
Matt Bruce 2024-04-17 15:50:23 -05:00
commit 90783667d8

View File

@ -61,6 +61,19 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
}
}
private var iconSize: Size.ValueType {
switch (size, kind) {
case (.large, .ghost):
return Icon.Size.large
case (.small, .ghost):
return Icon.Size.medium
case (.large, .lowContrast), (.large, .highContrast):
return Icon.Size.medium
case (.small, .lowContrast), (.small, .highContrast):
return Icon.Size.small
}
}
//--------------------------------------------------
// MARK: - Private Properties
//--------------------------------------------------
@ -430,7 +443,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
icon.name = currentIconName
let color = iconColorConfiguration.getColor(self)
icon.color = color
icon.size = size.value
icon.size = iconSize
icon.customSize = customSize
icon.isEnabled = isEnabled
} else {