diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-05-26 11:43:09 +0800 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-05-26 11:43:09 +0800 |
| commit | daf92f36e1b1eee63b1b6a4c3b36a47c34809ac3 (patch) | |
| tree | 6a99416823df50363157f0b32f39266d158e7720 /modules | |
| parent | dashboard: better media panel (diff) | |
| download | caelestia-shell-daf92f36e1b1eee63b1b6a4c3b36a47c34809ac3.tar.gz caelestia-shell-daf92f36e1b1eee63b1b6a4c3b36a47c34809ac3.tar.bz2 caelestia-shell-daf92f36e1b1eee63b1b6a4c3b36a47c34809ac3.zip | |
dashboard: fix tab indicator animation
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/dashboard/Content.qml | 4 | ||||
| -rw-r--r-- | modules/dashboard/Tabs.qml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index fc2046f..4026989 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -10,11 +10,12 @@ Item { id: root required property PersistentProperties visibilities + readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2 anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom - implicitWidth: view.implicitWidth + viewWrapper.anchors.margins * 2 + implicitWidth: nonAnimWidth implicitHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins * 2 Tabs { @@ -26,6 +27,7 @@ Item { anchors.topMargin: Appearance.padding.normal anchors.margins: Appearance.padding.large + nonAnimWidth: root.nonAnimWidth currentIndex: view.currentIndex } diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index f50639c..d33940a 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -8,9 +8,10 @@ import QtQuick.Controls Item { id: root + required property real nonAnimWidth property alias currentIndex: bar.currentIndex - implicitHeight: bar.height + indicator.height + indicator.anchors.topMargin + separator.height + implicitHeight: bar.implicitHeight + indicator.implicitHeight + indicator.anchors.topMargin + separator.implicitHeight TabBar { id: bar @@ -53,7 +54,8 @@ Item { x: { const tab = bar.currentItem; - return tab.x + (tab.width - tab.implicitWidth) / 2; + const width = (root.nonAnimWidth - DashboardConfig.sizes.tabIndicatorSpacing * (bar.count - 1) * 2) / bar.count + return width * tab.TabBar.index + (width - tab.implicitWidth) / 2; } clip: true |