From 36ac017e3d2492e0ac1684498557a8a7e5cfe182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Mon, 24 Apr 2023 21:14:08 +0800 Subject: [PATCH] update --- .github/workflows/ubuntu.yml | 2 +- src/controls/FluContentDialog.qml | 22 ++++++++++++++++++++++ src/controls/FluMenu.qml | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 52db5f5..d8b5ef3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -56,7 +56,7 @@ jobs: - name: package run: | # make sure Qt plugin finds QML sources so it can deploy the imported files - export QML_SOURCES_PATHS=example + export QML_SOURCES_PATHS=./ # 拷贝依赖 linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/release/${targetName} --appdir bin/release/ mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage diff --git a/src/controls/FluContentDialog.qml b/src/controls/FluContentDialog.qml index 824f7a2..7b5c2a7 100644 --- a/src/controls/FluContentDialog.qml +++ b/src/controls/FluContentDialog.qml @@ -29,6 +29,28 @@ Popup { anchors.centerIn: Overlay.overlay closePolicy: Popup.CloseOnEscape background:Item{} + + enter: Transition { + reversible: true + NumberAnimation { + properties: "opacity,scale" + from:0 + to:1 + duration: 167 + easing.type: Easing.BezierSpline + easing.bezierCurve: [ 0, 0, 0, 1 ] + } + } + exit:Transition { + NumberAnimation { + properties: "opacity,scale" + from:1 + to:0 + duration: 167 + easing.type: Easing.BezierSpline + easing.bezierCurve: [ 1, 0, 0, 0 ] + } + } contentItem: Rectangle { id:layout_content implicitWidth:minWidth diff --git a/src/controls/FluMenu.qml b/src/controls/FluMenu.qml index adf0adc..1bc459e 100644 --- a/src/controls/FluMenu.qml +++ b/src/controls/FluMenu.qml @@ -40,6 +40,8 @@ Menu { Rectangle{ anchors.fill: parent color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1) + border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) + border.width: 1 radius: 5 } Column{