diff --git a/qt6/src/qml/ButtonBox.qml b/qt6/src/qml/ButtonBox.qml index f5d8643b..63f3f83a 100644 --- a/qt6/src/qml/ButtonBox.qml +++ b/qt6/src/qml/ButtonBox.qml @@ -26,6 +26,29 @@ Control { } + ParallelAnimation { + running: btnGroup.checkedButton && (btnGroup.checkedButton.x !== backgroundPanel.x || btnGroup.checkedButton.y !== backgroundPanel.y) + NumberAnimation { target: backgroundPanel; property: "x"; to: btnGroup.checkedButton ? btnGroup.checkedButton.x : backgroundPanel.x; duration: 200 } + NumberAnimation { target: backgroundPanel; property: "y"; to: btnGroup.checkedButton ? btnGroup.checkedButton.y : backgroundPanel.y; duration: 200 } + NumberAnimation { target: backgroundPanel; property: "width"; to: btnGroup.checkedButton ? btnGroup.checkedButton.width : backgroundPanel.width; duration: 200 } + NumberAnimation { target: backgroundPanel; property: "height"; to: btnGroup.checkedButton ? btnGroup.checkedButton.height : backgroundPanel.height; duration: 200 } + } + + P.ButtonPanel { + id: backgroundPanel + visible: btnGroup.checkedButton + implicitWidth: visible ? btnGroup.checkedButton.width : 0 + implicitHeight: visible ? btnGroup.checkedButton.height : 0 + button: control + outsideBorderColor: null + color1: D.Palette { + normal { + common: Qt.rgba(0, 0, 0, 0.2) + } + } + color2: color1 + } + ParallelAnimation { running: btnGroup.checkedButton && (btnGroup.checkedButton.x !== backgroundPanel.x || btnGroup.checkedButton.y !== backgroundPanel.y) NumberAnimation { target: backgroundPanel; property: "x"; to: btnGroup.checkedButton ? btnGroup.checkedButton.x : backgroundPanel.x; duration: 200 } diff --git a/qt6/src/qml/Menu.qml b/qt6/src/qml/Menu.qml index 5b57d614..29c03ced 100644 --- a/qt6/src/qml/Menu.qml +++ b/qt6/src/qml/Menu.qml @@ -91,6 +91,7 @@ T.Menu { anchors.rightMargin: 6 scale: 0.9 property D.Palette backgroundColor: DS.Style.highlightPanel.background + color: D.ColorSelector.backgroundColor property D.Palette submenuOpenedItemHighlightColor: DS.Style.menu.submenuOpenedItemHighlight property D.Palette itemHighlightShadowColor: DS.Style.menu.itemHighlightShadow color: { @@ -108,6 +109,7 @@ T.Menu { Behavior on scale { NumberAnimation { duration: 100 } } + BoxInsetShadow { visible: highlightRect.color === highlightRect.D.ColorSelector.backgroundColor anchors.fill: parent