summaryrefslogtreecommitdiff
path: root/modules/dashboard
diff options
context:
space:
mode:
Diffstat (limited to 'modules/dashboard')
-rw-r--r--modules/dashboard/Dash.qml4
-rw-r--r--modules/dashboard/Tabs.qml21
-rw-r--r--modules/dashboard/dash/User.qml9
3 files changed, 17 insertions, 17 deletions
diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml
index 1631287..2d768c7 100644
--- a/modules/dashboard/Dash.qml
+++ b/modules/dashboard/Dash.qml
@@ -7,8 +7,8 @@ import QtQuick.Layouts
GridLayout {
id: root
- rowSpacing: Appearance.spacing.small
- columnSpacing: Appearance.spacing.small
+ rowSpacing: Appearance.spacing.normal
+ columnSpacing: Appearance.spacing.normal
Rect {
Layout.columnSpan: 3
diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml
index 5b9793a..4a1fa0e 100644
--- a/modules/dashboard/Tabs.qml
+++ b/modules/dashboard/Tabs.qml
@@ -84,7 +84,6 @@ Item {
required property string iconName
readonly property bool current: TabBar.tabBar.currentItem === this
- property real fill: current ? 1 : 0
background: null
@@ -204,10 +203,16 @@ Item {
text: tab.iconName
color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant
+ fill: tab.current ? 1 : 0
font.pointSize: Appearance.font.size.large
- font.variableAxes: ({
- FILL: tab.fill
- })
+
+ Behavior on fill {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.standard
+ }
+ }
}
StyledText {
@@ -221,14 +226,6 @@ Item {
}
}
-
- Behavior on fill {
- NumberAnimation {
- duration: Appearance.anim.durations.normal
- easing.type: Easing.BezierSpline
- easing.bezierCurve: Appearance.anim.curves.standard
- }
- }
}
component Anim: NumberAnimation {
diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml
index f8acdfd..700216f 100644
--- a/modules/dashboard/dash/User.qml
+++ b/modules/dashboard/dash/User.qml
@@ -15,8 +15,8 @@ Row {
spacing: Appearance.spacing.large
ClippingRectangle {
- implicitWidth: DashboardConfig.sizes.faceSize
- implicitHeight: DashboardConfig.sizes.faceSize
+ implicitWidth: info.implicitHeight
+ implicitHeight: info.implicitHeight
radius: Appearance.rounding.full
color: Colours.palette.m3surfaceContainerHigh
@@ -25,7 +25,8 @@ Row {
anchors.centerIn: parent
text: "person"
- font.pointSize: DashboardConfig.sizes.faceSize / 2
+ fill: 1
+ font.pointSize: (info.implicitHeight / 2) || 1
}
CachingImage {
@@ -43,6 +44,8 @@ Row {
}
Column {
+ id: info
+
spacing: Appearance.spacing.normal
InfoLine {