diff --git a/src/controls/FluSlider.qml b/src/controls/FluSlider.qml index 9631f1f..1df29f3 100644 --- a/src/controls/FluSlider.qml +++ b/src/controls/FluSlider.qml @@ -73,16 +73,16 @@ Item{ anchors.horizontalCenter: vertical ? parent.horizontalCenter : undefined color:FluTheme.dark ? Qt.rgba(69/255,69/255,69/255,1) :Qt.rgba(1,1,1,1) Rectangle{ - width: dotSize/2 - height: dotSize/2 - radius: dotSize/4 + width: dotSize + height: dotSize + radius: dotSize/2 color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark anchors.centerIn: parent scale: { if(control_mouse.pressed){ - return 0.9 + return 4/10 } - return control_mouse.containsMouse || mouse_line.containsMouse ? 1.3 : 1 + return control_mouse.containsMouse || mouse_line.containsMouse ? 6/10 : 5/10 } Behavior on scale { NumberAnimation{ diff --git a/src/controls/FluToggleSwitch.qml b/src/controls/FluToggleSwitch.qml index f8b005f..b429b5d 100644 --- a/src/controls/FluToggleSwitch.qml +++ b/src/controls/FluToggleSwitch.qml @@ -57,18 +57,16 @@ FluControl { border.width: 1 border.color: selected ? Qt.lighter(FluTheme.primaryColor.dark,1.2) : "#666666" Rectangle { - width: pressed ? control.height - 4 : control.height - 8 + width: pressed ? 28 : 20 anchors{ left: selected ? undefined : parent.left - leftMargin: selected ? control_backgound.width - width - 4 : 4 + leftMargin: selected ? 10 : 0 right: selected ? parent.right : undefined - rightMargin: selected ? 4 : control_backgound.width - width - 4 + rightMargin: selected ? 0: 10 } - height: control.height - 8 - radius: width / 2 - antialiasing: true - scale: hovered ? 1.2 : 1.0 - smooth: true + height: 20 + radius: 10 + scale: hovered ? 7/10 : 6/10 anchors.verticalCenter: parent.verticalCenter color: selected ? "#FFFFFF" : "#666666" Behavior on anchors.leftMargin {