Compare commits
No commits in common. "661529f1f430eab8ab5f09b7b73cb0535bb9b8bc" and "bdbd5d295eb6037f3593cb4edabece86e6dad0ea" have entirely different histories.
661529f1f4
...
bdbd5d295e
|
@ -37,7 +37,6 @@ Button {
|
||||||
return Qt.rgba(0,0,0,1)
|
return Qt.rgba(0,0,0,1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
property color textColor: FluTheme.fontPrimaryColor
|
|
||||||
Accessible.role: Accessible.Button
|
Accessible.role: Accessible.Button
|
||||||
Accessible.name: control.text
|
Accessible.name: control.text
|
||||||
Accessible.description: contentDescription
|
Accessible.description: contentDescription
|
||||||
|
@ -48,7 +47,6 @@ Button {
|
||||||
verticalPadding: 8
|
verticalPadding: 8
|
||||||
horizontalPadding: 8
|
horizontalPadding: 8
|
||||||
enabled: !disabled
|
enabled: !disabled
|
||||||
font:FluTextStyle.Caption
|
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
implicitWidth: 30
|
implicitWidth: 30
|
||||||
implicitHeight: 30
|
implicitHeight: 30
|
||||||
|
@ -82,8 +80,6 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
color: control.textColor
|
|
||||||
font: control.font
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,12 +95,10 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
color: control.textColor
|
|
||||||
font: control.font
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem:FluLoader{
|
contentItem:Loader{
|
||||||
sourceComponent: {
|
sourceComponent: {
|
||||||
if(display === Button.TextUnderIcon){
|
if(display === Button.TextUnderIcon){
|
||||||
return com_column
|
return com_column
|
||||||
|
|
|
@ -38,7 +38,6 @@ Button {
|
||||||
return Qt.rgba(0,0,0,1)
|
return Qt.rgba(0,0,0,1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
property color textColor: FluTheme.fontPrimaryColor
|
|
||||||
Accessible.role: Accessible.Button
|
Accessible.role: Accessible.Button
|
||||||
Accessible.name: control.text
|
Accessible.name: control.text
|
||||||
Accessible.description: contentDescription
|
Accessible.description: contentDescription
|
||||||
|
@ -49,7 +48,6 @@ Button {
|
||||||
verticalPadding: 8
|
verticalPadding: 8
|
||||||
horizontalPadding: 8
|
horizontalPadding: 8
|
||||||
enabled: !disabled
|
enabled: !disabled
|
||||||
font:FluTextStyle.Caption
|
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
implicitWidth: 30
|
implicitWidth: 30
|
||||||
implicitHeight: 30
|
implicitHeight: 30
|
||||||
|
@ -83,8 +81,6 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
color: control.textColor
|
|
||||||
font: control.font
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,8 +96,6 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
color: control.textColor
|
|
||||||
font: control.font
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue