Compare commits

..

No commits in common. "6b617d10d54dba7dce718b8b7eb7d588b4f30732" and "84b2045b5f17227e61e851b12bace6700abd5972" have entirely different histories.

8 changed files with 12 additions and 26 deletions

View File

@ -63,10 +63,10 @@ T.ComboBox {
selectByMouse: true
verticalAlignment: Text.AlignVCenter
background: FluTextBoxBackground{
border.width: 1
border.width: 0
bottomMargin: {
if(!control.editable){
return 1
return 0
}
return contentItem && contentItem.activeFocus ? 2 : 1
}

View File

@ -26,7 +26,7 @@ Item{
radius: control.radius
gradient: Gradient {
GradientStop { position: 0.0; color: d.startColor }
GradientStop { position: 1 - 3/control.height; color: d.startColor }
GradientStop { position: 0.88; color: d.startColor }
GradientStop { position: 1.0; color: d.endColor}
}
}
@ -40,12 +40,6 @@ Item{
leftMargin: control.leftMargin
rightMargin: control.rightMargin
}
Behavior on anchors.bottomMargin {
NumberAnimation{
easing.type: Easing.OutCubic
duration: 167
}
}
radius: control.radius
color: control.color
}

View File

@ -5,7 +5,7 @@ import FluentUI 1.0
Item {
//DropShadow
property color color: FluTheme.dark ? "#AAAAAA" : "#999999"
property int elevation: 5
property int elevation: 6
property int radius: 4
id:control
anchors.fill: parent

View File

@ -20,14 +20,13 @@ FluControlBackground{
border.width: 1
gradient: Gradient {
GradientStop { position: 0.0; color: d.startColor }
GradientStop { position: 1 - d.offsetSize/control.height; color: d.startColor }
GradientStop { position: 1 - 1/control.height; color: d.endColor }
GradientStop { position: 1 - 3/control.height; color: d.startColor }
GradientStop { position: 1 - 2/control.height; color: d.startColor }
GradientStop { position: 1.0; color: d.endColor }
}
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
QtObject{
id:d
property int offsetSize : inputItem && inputItem.activeFocus ? 2 : 3
property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
property color endColor: {
if(!control.enabled){

View File

@ -63,10 +63,10 @@ T.ComboBox {
selectByMouse: true
verticalAlignment: Text.AlignVCenter
background: FluTextBoxBackground{
border.width: 1
border.width: 0
bottomMargin: {
if(!control.editable){
return 1
return 0
}
return contentItem && contentItem.activeFocus ? 2 : 1
}

View File

@ -26,7 +26,7 @@ Item{
radius: control.radius
gradient: Gradient {
GradientStop { position: 0.0; color: d.startColor }
GradientStop { position: 1 - 3/control.height; color: d.startColor }
GradientStop { position: 0.88; color: d.startColor }
GradientStop { position: 1.0; color: d.endColor}
}
}
@ -40,12 +40,6 @@ Item{
leftMargin: control.leftMargin
rightMargin: control.rightMargin
}
Behavior on anchors.bottomMargin {
NumberAnimation{
easing.type: Easing.OutCubic
duration: 167
}
}
radius: control.radius
color: control.color
}

View File

@ -5,7 +5,7 @@ import FluentUI
Item {
//DropShadow
property color color: FluTheme.dark ? "#AAAAAA" : "#999999"
property int elevation: 5
property int elevation: 6
property int radius: 4
id:control
anchors.fill: parent

View File

@ -20,14 +20,13 @@ FluControlBackground{
border.width: 1
gradient: Gradient {
GradientStop { position: 0.0; color: d.startColor }
GradientStop { position: 1 - d.offsetSize/control.height; color: d.startColor }
GradientStop { position: 1 - 1/control.height; color: d.endColor }
GradientStop { position: 1 - 3/control.height; color: d.startColor }
GradientStop { position: 1 - 2/control.height; color: d.startColor }
GradientStop { position: 1.0; color: d.endColor }
}
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
QtObject{
id:d
property int offsetSize : inputItem && inputItem.activeFocus ? 2 : 3
property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
property color endColor: {
if(!control.enabled){