diff --git a/src/controls/DesktopMenu.qml b/src/controls/DesktopMenu.qml index 0023731..346cb22 100644 --- a/src/controls/DesktopMenu.qml +++ b/src/controls/DesktopMenu.qml @@ -30,7 +30,7 @@ FishUI.MenuPopupWindow { Rectangle { id: _background anchors.fill: parent - color: FishUI.Theme.backgroundColor + color: FishUI.Theme.secondBackgroundColor radius: windowHelper.compositing ? FishUI.Theme.hugeRadius : 0 opacity: windowHelper.compositing ? 0.6 : 1 diff --git a/src/controls/RoundImageButton.qml b/src/controls/RoundImageButton.qml index 17989cc..efeab03 100644 --- a/src/controls/RoundImageButton.qml +++ b/src/controls/RoundImageButton.qml @@ -26,6 +26,7 @@ Item { id: control property var size: 32 + property var iconMargins: 0 height: size width: size @@ -56,6 +57,7 @@ Item { id: image objectName: "image" anchors.fill: parent + anchors.margins: control.iconMargins fillMode: Image.PreserveAspectFit sourceSize: Qt.size(width, height) cache: true diff --git a/src/controls/Window.qml b/src/controls/Window.qml index ad26ff7..4d3ab00 100644 --- a/src/controls/Window.qml +++ b/src/controls/Window.qml @@ -296,7 +296,7 @@ Window { } Item { - width: FishUI.Units.smallSpacing + width: _header.spacing } } } diff --git a/src/fish-style/Button.qml b/src/fish-style/Button.qml index 014d5e5..f65d03c 100644 --- a/src/fish-style/Button.qml +++ b/src/fish-style/Button.qml @@ -9,6 +9,13 @@ T.Button implicitWidth: Math.max(background.implicitWidth, contentItem.implicitWidth + FishUI.Units.largeSpacing) implicitHeight: background.implicitHeight hoverEnabled: true + scale: control.pressed ? 0.95 : 1.0 + + Behavior on scale { + NumberAnimation { + duration: 100 + } + } property color hoveredColor: Qt.tint(FishUI.Theme.textColor, Qt.rgba(FishUI.Theme.backgroundColor.r, FishUI.Theme.backgroundColor.g,