diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/controls/CustomSpinBox.qml | 2 | ||||
| -rw-r--r-- | components/controls/FilledSlider.qml | 6 | ||||
| -rw-r--r-- | components/controls/StyledSlider.qml | 2 | ||||
| -rw-r--r-- | components/controls/StyledSwitch.qml | 4 | ||||
| -rw-r--r-- | components/effects/InnerBorder.qml | 2 | ||||
| -rw-r--r-- | components/filedialog/CurrentItem.qml | 2 | ||||
| -rw-r--r-- | components/filedialog/DialogButtons.qml | 8 | ||||
| -rw-r--r-- | components/filedialog/FileDialog.qml | 2 | ||||
| -rw-r--r-- | components/filedialog/FolderContents.qml | 4 | ||||
| -rw-r--r-- | components/filedialog/HeaderBar.qml | 4 | ||||
| -rw-r--r-- | components/filedialog/Sidebar.qml | 2 |
11 files changed, 20 insertions, 18 deletions
diff --git a/components/controls/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml index 4611bed..e2ed508 100644 --- a/components/controls/CustomSpinBox.qml +++ b/components/controls/CustomSpinBox.qml @@ -30,7 +30,7 @@ RowLayout { background: StyledRect { implicitWidth: 100 radius: Appearance.rounding.small - color: Colours.palette.m3surfaceContainerHigh + color: Colours.tPalette.m3surfaceContainerHigh } } diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index 8d0e547..af60e9f 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -14,7 +14,7 @@ Slider { orientation: Qt.Vertical background: StyledRect { - color: Colours.alpha(Colours.palette.m3surfaceContainer, true) + color: Colours.tPalette.m3surfaceContainer radius: Appearance.rounding.full StyledRect { @@ -24,7 +24,7 @@ Slider { y: root.handle.y implicitHeight: parent.height - y - color: Colours.alpha(Colours.palette.m3secondary, true) + color: Colours.palette.m3secondary radius: parent.radius } } @@ -49,7 +49,7 @@ Slider { anchors.fill: parent - color: Colours.alpha(Colours.palette.m3inverseSurface, true) + color: Colours.palette.m3inverseSurface radius: Appearance.rounding.full MouseArea { diff --git a/components/controls/StyledSlider.qml b/components/controls/StyledSlider.qml index 25b5bdd..0670e1c 100644 --- a/components/controls/StyledSlider.qml +++ b/components/controls/StyledSlider.qml @@ -32,7 +32,7 @@ Slider { implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6 - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer radius: Appearance.rounding.full topLeftRadius: root.implicitHeight / 15 bottomLeftRadius: root.implicitHeight / 15 diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index c9d7330..e90ced2 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -8,12 +8,14 @@ import QtQuick.Shapes Switch { id: root + property int cLayer: 1 + implicitWidth: implicitIndicatorWidth implicitHeight: implicitIndicatorHeight indicator: StyledRect { radius: Appearance.rounding.full - color: root.checked ? Colours.palette.m3primary : Colours.palette.m3surfaceContainerHighest + color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer) implicitWidth: implicitHeight * 1.7 implicitHeight: Appearance.font.size.normal + Appearance.padding.smaller * 2 diff --git a/components/effects/InnerBorder.qml b/components/effects/InnerBorder.qml index e5092ca..d4a751f 100644 --- a/components/effects/InnerBorder.qml +++ b/components/effects/InnerBorder.qml @@ -15,7 +15,7 @@ StyledRect { property alias bottomThickness: maskInner.anchors.bottomMargin anchors.fill: parent - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer layer.enabled: true layer.effect: MultiEffect { diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index e042445..9f8ffac 100644 --- a/components/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml @@ -23,7 +23,7 @@ Item { readonly property real roundingY: flatten ? root.implicitHeight / 2 : rounding strokeWidth: -1 - fillColor: Colours.palette.m3surfaceContainer + fillColor: Colours.tPalette.m3surfaceContainer startX: root.implicitWidth startY: root.implicitHeight diff --git a/components/filedialog/DialogButtons.qml b/components/filedialog/DialogButtons.qml index a64195a..c5b11dc 100644 --- a/components/filedialog/DialogButtons.qml +++ b/components/filedialog/DialogButtons.qml @@ -11,7 +11,7 @@ StyledRect { implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer RowLayout { id: inner @@ -30,7 +30,7 @@ StyledRect { Layout.fillHeight: true Layout.rightMargin: Appearance.spacing.normal - color: Colours.palette.m3surfaceContainerHigh + color: Colours.tPalette.m3surfaceContainerHigh radius: Appearance.rounding.small StyledText { @@ -42,7 +42,7 @@ StyledRect { } StyledRect { - color: Colours.palette.m3surfaceContainerHigh + color: Colours.tPalette.m3surfaceContainerHigh radius: Appearance.rounding.small implicitWidth: cancelText.implicitWidth + Appearance.padding.normal * 2 @@ -68,7 +68,7 @@ StyledRect { } StyledRect { - color: Colours.palette.m3surfaceContainerHigh + color: Colours.tPalette.m3surfaceContainerHigh radius: Appearance.rounding.small implicitWidth: cancelText.implicitWidth + Appearance.padding.normal * 2 diff --git a/components/filedialog/FileDialog.qml b/components/filedialog/FileDialog.qml index a533243..8b0b331 100644 --- a/components/filedialog/FileDialog.qml +++ b/components/filedialog/FileDialog.qml @@ -50,7 +50,7 @@ LazyLoader { implicitWidth: 1000 implicitHeight: 600 - color: Colours.palette.m3surface + color: Colours.tPalette.m3surface title: loader.title onVisibleChanged: { diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index 57500c8..7a7cc31 100644 --- a/components/filedialog/FolderContents.qml +++ b/components/filedialog/FolderContents.qml @@ -22,7 +22,7 @@ Item { StyledRect { anchors.fill: parent - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer layer.enabled: true layer.effect: MultiEffect { @@ -124,7 +124,7 @@ Item { implicitHeight: nonAnimHeight radius: Appearance.rounding.normal - color: Qt.alpha(Colours.palette.m3surfaceContainerHighest, GridView.isCurrentItem ? 1 : 0) + color: Qt.alpha(Colours.tPalette.m3surfaceContainerHighest, GridView.isCurrentItem ? 1 : 0) z: GridView.isCurrentItem || implicitHeight !== nonAnimHeight ? 1 : 0 clip: true diff --git a/components/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml index 4af9672..b6e5dba 100644 --- a/components/filedialog/HeaderBar.qml +++ b/components/filedialog/HeaderBar.qml @@ -14,7 +14,7 @@ StyledRect { implicitWidth: inner.implicitWidth + Appearance.padding.normal * 2 implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer RowLayout { id: inner @@ -50,7 +50,7 @@ StyledRect { Layout.fillWidth: true radius: Appearance.rounding.small - color: Colours.palette.m3surfaceContainerHigh + color: Colours.tPalette.m3surfaceContainerHigh implicitHeight: pathComponents.implicitHeight + pathComponents.anchors.margins * 2 diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index 173b429..e9a15bd 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -14,7 +14,7 @@ StyledRect { implicitWidth: Sizes.sidebarWidth implicitHeight: inner.implicitHeight + Appearance.padding.normal * 2 - color: Colours.palette.m3surfaceContainer + color: Colours.tPalette.m3surfaceContainer ColumnLayout { id: inner |