Update shared components

emericg · Aug 13, 2024 · 1b2d97e · 1b2d97e
1 parent 6794774
commit 1b2d97e
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 289 deletions.
diff --git a/qml/ComponentLibrary/ComponentLibrary.qrc b/qml/ComponentLibrary/ComponentLibrary.qrc
@@ -113,8 +113,8 @@
         <file alias="TumblerThemed.qml">controls/TumblerThemed.qml</file>
 
         <file alias="DatePicker.qml">complex/DatePicker.qml</file>
-        <file alias="TextField_FileDialog.qml">complex/TextField_FileDialog.qml</file>
-        <file alias="TextField_FolderDialog.qml">complex/TextField_FolderDialog.qml</file>
+        <file alias="FileInputArea.qml">complex/FileInputArea.qml</file>
+        <file alias="FolderInputArea.qml">complex/FolderInputArea.qml</file>
 
         <file alias="MapButton.qml">maps/MapButton.qml</file>
         <file alias="MapButtonCompass.qml">maps/MapButtonCompass.qml</file>

diff --git a/qml/components/FileInputArea.qml → ...omponentLibrary/complex/FileInputArea.qml b/qml/components/FileInputArea.qml → ...omponentLibrary/complex/FileInputArea.qml
diff --git a/qml/components/FolderInputArea.qml → ...ponentLibrary/complex/FolderInputArea.qml b/qml/components/FolderInputArea.qml → ...ponentLibrary/complex/FolderInputArea.qml
diff --git a/qml/ComponentLibrary/complex/TextField_FileDialog.qml b/qml/ComponentLibrary/complex/TextField_FileDialog.qml
diff --git a/qml/ComponentLibrary/complex/TextField_FolderDialog.qml b/qml/ComponentLibrary/complex/TextField_FolderDialog.qml
diff --git a/qml/ComponentLibrary/controls/ScrollBarThemed.qml b/qml/ComponentLibrary/controls/ScrollBarThemed.qml
@@ -12,8 +12,18 @@ T.ScrollBar {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
 
+    leftPadding: 0
+    rightPadding: 0
+
     visible: (policy !== T.ScrollBar.AlwaysOff)
-    minimumSize: (orientation === Qt.Horizontal) ? height / width : width / height
+
+    minimumSize: (orientation === Qt.Horizontal) ? (height / width) : (width / height)
+
+    property int radius: isDesktop ? 0 : 8
+
+    property color colorBackground: Theme.colorBackground
+    property color colorMoving: Theme.colorSecondary
+    property color colorPressed: Theme.colorPrimary
 
     ////////////////
 
@@ -45,7 +55,8 @@ T.ScrollBar {
         y: control.topPadding
         height: control.height - control.topPadding - control.bottomPadding
 
-        color: Theme.colorBackground
+        radius: control.radius
+        color: control.colorBackground
         opacity: 0.0
     }
 
@@ -55,7 +66,8 @@ T.ScrollBar {
         implicitWidth: control.interactive ? 12 : 6
         implicitHeight: control.interactive ? 12 : 6
 
-        color: control.pressed ? Theme.colorSecondary : Theme.colorForeground
+        radius: control.radius
+        color: control.pressed ? control.colorPressed : control.colorMoving
         opacity: 0.0
     }
 

diff --git a/qml/ComponentLibrary/deprecated/ButtonText.qml b/qml/ComponentLibrary/deprecated/ButtonText.qml
@@ -34,7 +34,7 @@ T.Button {
         radius: 2
         opacity: {
             if (!control.enabled) return 0.4
-            if (control.hovered && !control.highlighted) return 0.3
+            if (control.hovered && !control.highlighted) return 0.66
             return 1
         }
         color: {

diff --git a/qml/ComponentLibrary/generic/SelectorGrid.qml b/qml/ComponentLibrary/generic/SelectorGrid.qml
@@ -6,17 +6,17 @@ Item {
     id: selectorGrid
 
     implicitWidth: 512
-    implicitHeight: 40
+    implicitHeight: Theme.componentHeight
 
     width: parent.width
-    height: (selectorGrid.btnRows * btnHeight) + (selectorGrid.btnRows * contentPositioner.spacing)
+    height: (selectorGrid.btnRows * btnHeight) + ((selectorGrid.btnRows-1) * contentPositioner.spacing)
 
     opacity: enabled ? 1 : 0.66
 
     property int btnCols: 4
     property int btnRows: 3
-    property int btnWidth: width / selectorGrid.btnCols
-    property int btnHeight: 40
+    property int btnWidth: ((width - ((selectorGrid.btnCols-1) * contentPositioner.spacing)) / selectorGrid.btnCols)
+    property int btnHeight: Theme.componentHeight
 
     signal menuSelected(var index)
     property int currentSelection: 0
@@ -36,7 +36,6 @@ Item {
     Grid {
         id: contentPositioner
         anchors.fill: parent
-        anchors.margins: 0
         spacing: 1
 
         columns: selectorGrid.btnCols

diff --git a/qml/ComponentLibrary/menus/DesktopHeaderItem.qml b/qml/ComponentLibrary/menus/DesktopHeaderItem.qml
@@ -24,6 +24,7 @@ T.Button {
     // colors
     property color colorContent: Theme.colorHeaderContent
     property color colorHighlight: Theme.colorHeaderHighlight
+    property color colorRipple: Qt.rgba(colorContent.r, colorContent.g, colorContent.b, 0.08)
 
     ////////////////////////////////////////////////////////////////////////////
 
@@ -46,6 +47,16 @@ T.Button {
         }
         Behavior on opacity { OpacityAnimator { duration: 233 } }
 
+        RippleThemed {
+            anchors.fill: parent
+            anchor: control
+            clip: true
+
+            pressed: control.pressed
+            active: control.enabled && control.down
+            color: control.colorRipple
+        }
+
         Rectangle { // backgroundIndicator
             anchors.top: parent.top
             anchors.left: parent.left