From 5ef62fd6b4eff6da8f24f584e6e16374c65c8cb9 Mon Sep 17 00:00:00 2001 From: Emeric Date: Tue, 12 Sep 2023 18:50:08 +0200 Subject: [PATCH] Update QML components --- qml/MobileDrawer.qml | 17 +++++++++-------- qml/components_generic/AndroidTextField.qml | 2 +- qml/components_themed/RangeSliderThemed.qml | 4 ++-- qml/components_themed/SpinBoxThemed_desktop.qml | 2 +- qml/components_themed/SpinBoxThemed_mobile.qml | 2 +- qml/components_themed/TextAreaThemed.qml | 2 +- qml/components_themed/TextFieldThemed.qml | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/qml/MobileDrawer.qml b/qml/MobileDrawer.qml index 508a380..864bd74 100644 --- a/qml/MobileDrawer.qml +++ b/qml/MobileDrawer.qml @@ -8,6 +8,9 @@ Drawer { ? 0.8 * appWindow.width : 0.5 * appWindow.width height: appWindow.height + topPadding: 0 + bottomPadding: 0 + //////////////////////////////////////////////////////////////////////////// background: Rectangle { @@ -26,7 +29,7 @@ Drawer { contentItem: Item { Column { - id: rectangleHeader + id: headerColumn anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right @@ -34,19 +37,18 @@ Drawer { //////// - Rectangle { - id: rectangleStatusbar + Rectangle { // statusbar area anchors.left: parent.left anchors.right: parent.right + anchors.rightMargin: -1 height: Math.max(screenPaddingTop, screenPaddingStatusbar) - color: Theme.colorBackground // to hide flickable content + color: Theme.colorStatusbar } //////// - Rectangle { - id: rectangleLogo + Rectangle { // logo area anchors.left: parent.left anchors.right: parent.right @@ -84,7 +86,7 @@ Drawer { //////////////////////////////////////////////////////////////////////// Flickable { - anchors.top: rectangleHeader.bottom + anchors.top: headerColumn.bottom anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom @@ -96,7 +98,6 @@ Drawer { id: contentColumn anchors.left: parent.left anchors.right: parent.right - anchors.rightMargin: 1 //////// diff --git a/qml/components_generic/AndroidTextField.qml b/qml/components_generic/AndroidTextField.qml index f82aec1..ef364df 100644 --- a/qml/components_generic/AndroidTextField.qml +++ b/qml/components_generic/AndroidTextField.qml @@ -40,8 +40,8 @@ T.TextField { property string colorPlaceholderText: Theme.colorSubText property string colorBorder: Theme.colorSubText property string colorBackground: Theme.colorBackground - property string colorSelectedText: Theme.colorHighContrast property string colorSelection: Theme.colorPrimary + property string colorSelectedText: "white" //////////////// diff --git a/qml/components_themed/RangeSliderThemed.qml b/qml/components_themed/RangeSliderThemed.qml index 1775d3d..428f6d5 100644 --- a/qml/components_themed/RangeSliderThemed.qml +++ b/qml/components_themed/RangeSliderThemed.qml @@ -68,7 +68,7 @@ T.RangeSlider { anchors.fill: parent radius: width color: Theme.colorPrimary - opacity: (first.pressed || first.containsMouse) ? 0.2 : 0 + opacity: (first.pressed || parent.containsMouse) ? 0.2 : 0 Behavior on opacity { NumberAnimation { duration: 233 } } } } @@ -101,7 +101,7 @@ T.RangeSlider { anchors.fill: parent radius: width color: Theme.colorPrimary - opacity: (second.pressed || second.containsMouse) ? 0.2 : 0 + opacity: (second.pressed || parent.containsMouse) ? 0.2 : 0 Behavior on opacity { NumberAnimation { duration: 233 } } } } diff --git a/qml/components_themed/SpinBoxThemed_desktop.qml b/qml/components_themed/SpinBoxThemed_desktop.qml index 345f5a0..a51398d 100644 --- a/qml/components_themed/SpinBoxThemed_desktop.qml +++ b/qml/components_themed/SpinBoxThemed_desktop.qml @@ -75,7 +75,7 @@ T.SpinBox { Row { anchors.centerIn: parent - spacing: 2 + spacing: 4 TextInput { height: control.height diff --git a/qml/components_themed/SpinBoxThemed_mobile.qml b/qml/components_themed/SpinBoxThemed_mobile.qml index 68a594d..8ed4842 100644 --- a/qml/components_themed/SpinBoxThemed_mobile.qml +++ b/qml/components_themed/SpinBoxThemed_mobile.qml @@ -70,7 +70,7 @@ T.SpinBox { contentItem: Item { Row { anchors.centerIn: parent - spacing: 2 + spacing: 4 TextInput { height: control.height diff --git a/qml/components_themed/TextAreaThemed.qml b/qml/components_themed/TextAreaThemed.qml index 8ff627c..301890f 100644 --- a/qml/components_themed/TextAreaThemed.qml +++ b/qml/components_themed/TextAreaThemed.qml @@ -38,7 +38,7 @@ T.TextArea { property string colorBorder: Theme.colorComponentBorder property string colorBackground: Theme.colorComponentBackground property string colorSelection: Theme.colorPrimary - property string colorSelectedText: Theme.colorHighContrast + property string colorSelectedText: "white" //////////////// diff --git a/qml/components_themed/TextFieldThemed.qml b/qml/components_themed/TextFieldThemed.qml index ba0ac13..30e8102 100644 --- a/qml/components_themed/TextFieldThemed.qml +++ b/qml/components_themed/TextFieldThemed.qml @@ -38,7 +38,7 @@ T.TextField { property string colorBorder: Theme.colorComponentBorder property string colorBackground: Theme.colorComponentBackground property string colorSelection: Theme.colorPrimary - property string colorSelectedText: Theme.colorHighContrast + property string colorSelectedText: "white" ////////////////