From b79b52a647e3acd67e5fcfcacaffd8912e1ac688 Mon Sep 17 00:00:00 2001 From: ck Date: Fri, 9 Aug 2024 09:44:36 +0800 Subject: [PATCH] chore: switch animation tweak remove static dci icon --- qt6/src/qml/Switch.qml | 13 +++---------- src/dtkdeclarative_assets.qrc | 2 -- src/icons/bloom/switch_off_static.dci | Bin 5574 -> 0 bytes src/icons/bloom/switch_on_static.dci | Bin 6658 -> 0 bytes 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 src/icons/bloom/switch_off_static.dci delete mode 100644 src/icons/bloom/switch_on_static.dci diff --git a/qt6/src/qml/Switch.qml b/qt6/src/qml/Switch.qml index cbc62c37..4844b967 100644 --- a/qt6/src/qml/Switch.qml +++ b/qt6/src/qml/Switch.qml @@ -33,14 +33,9 @@ T.Switch { width: DS.Style.switchButton.handleWidth height: DS.Style.switchButton.handleHeight sourceSize: Qt.size(DS.Style.switchButton.indicatorWidth, DS.Style.switchButton.indicatorWidth) - name: control.checked ? "switch_on_static" : "switch_off_static" + name: !control.checked ? "switch_on" : "switch_off" opacity: control.D.ColorSelector.controlState === D.DTK.DisabledState && control.checked ? 0.4 : 1 - palette { - highlight: control.checked ? control.palette.highlight : control.D.ColorSelector.handleColor - highlightForeground: control.palette.highlightedText - foreground: control.palette.windowText - background: control.palette.window - } + palette: DTK.makeIconPalette(control.palette) mode: control.D.ColorSelector.controlState theme: control.D.ColorSelector.controlTheme fallbackToQIcon: false @@ -48,15 +43,13 @@ T.Switch { Timer { id: toggletimer - interval: 200 + interval: 300 onTriggered: { control.toggle() - handle.name = control.checked ? "switch_on_static" : "switch_off_static" } } function palyAndSetImage() { - handle.name = !control.checked ? "switch_on" : "switch_off" handle.play(D.DTK.NormalState) toggletimer.start(); } diff --git a/src/dtkdeclarative_assets.qrc b/src/dtkdeclarative_assets.qrc index 68948804..a10294a3 100644 --- a/src/dtkdeclarative_assets.qrc +++ b/src/dtkdeclarative_assets.qrc @@ -48,8 +48,6 @@ icons/bloom/slider_round_ver.dci icons/bloom/switch_on.dci icons/bloom/switch_off.dci - icons/bloom/switch_on_static.dci - icons/bloom/switch_off_static.dci icons/bloom/slider_point_up.dci icons/bloom/checkbox_mix.dci icons/bloom/checkbox_checked.dci diff --git a/src/icons/bloom/switch_off_static.dci b/src/icons/bloom/switch_off_static.dci deleted file mode 100644 index ffdc6758e35acb658e8281a0bd076856df5812da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5574 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