fix(StatusBaseButton): correct radius and icon size for `isRoundIcon` mode
- this fixes 2 small regressions, namely in how we calculate the background corner radius and icon size when in the mode of `isRoundIcon` - the "Saved addresses" button in wallet's left view is very special on its own; overall we have only 2 instances of this "round" icon buttons in the whole app Fixes #16156
This commit is contained in:
parent
08d8c9ebf2
commit
f59ce285a9
|
@ -203,7 +203,6 @@ SplitView {
|
||||||
enabled: ctrlEnabled.checked
|
enabled: ctrlEnabled.checked
|
||||||
interactive: ctrlInteractive.checked
|
interactive: ctrlInteractive.checked
|
||||||
isRoundIcon: true
|
isRoundIcon: true
|
||||||
radius: height/2
|
|
||||||
textFillWidth: ctrlFillWidth.checked
|
textFillWidth: ctrlFillWidth.checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,5 @@ import StatusQ.Controls 0.1
|
||||||
|
|
||||||
StatusButton {
|
StatusButton {
|
||||||
isRoundIcon: true
|
isRoundIcon: true
|
||||||
radius: height/2
|
|
||||||
icon.name: "arrow-left"
|
icon.name: "arrow-left"
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ Button {
|
||||||
property int borderWidth: 0
|
property int borderWidth: 0
|
||||||
property bool textFillWidth: false
|
property bool textFillWidth: false
|
||||||
|
|
||||||
property int radius: isRoundIcon ? height/2 : size === StatusBaseButton.Size.Tiny ? 6 : 8
|
property int radius: isRoundIcon && d.iconOnly ? height/2 : size === StatusBaseButton.Size.Tiny ? 6 : 8
|
||||||
|
|
||||||
property int size: StatusBaseButton.Size.Large
|
property int size: StatusBaseButton.Size.Large
|
||||||
property int type: StatusBaseButton.Type.Normal
|
property int type: StatusBaseButton.Type.Normal
|
||||||
|
@ -241,8 +241,8 @@ Button {
|
||||||
|
|
||||||
StatusRoundIcon {
|
StatusRoundIcon {
|
||||||
asset.name: root.icon.name
|
asset.name: root.icon.name
|
||||||
asset.width: root.icon.width
|
asset.width: d.iconSize
|
||||||
asset.height: root.icon.height
|
asset.height: d.iconSize
|
||||||
asset.color: root.icon.color
|
asset.color: root.icon.color
|
||||||
asset.bgColor: root.asset.bgColor
|
asset.bgColor: root.asset.bgColor
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ StatusButton {
|
||||||
|
|
||||||
focusPolicy: Qt.NoFocus
|
focusPolicy: Qt.NoFocus
|
||||||
isRoundIcon: true
|
isRoundIcon: true
|
||||||
radius: height/2
|
|
||||||
normalColor: Theme.palette.indirectColor3
|
normalColor: Theme.palette.indirectColor3
|
||||||
disabledColor: normalColor
|
disabledColor: normalColor
|
||||||
opacity: enabled ? 1 : 0.4
|
opacity: enabled ? 1 : 0.4
|
||||||
|
|
Loading…
Reference in New Issue