Minor UI improvements

emericg · Aug 7, 2024 · 6861030 · 6861030
1 parent c49c2bb
commit 6861030
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
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.12)
 
     ////////////////////////////////////////////////////////////////////////////
 
@@ -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

diff --git a/qml/MobileDrawer.qml b/qml/MobileDrawer.qml
@@ -81,6 +81,8 @@ DrawerThemed {
 
                 ////////
 
+                topPadding: -Theme.componentMargin/2
+
                 ListSeparatorPadded { }
 
                 ////////

diff --git a/qml/widgets/DeviceWidget.qml b/qml/widgets/DeviceWidget.qml
@@ -23,6 +23,10 @@ Item {
     property int margin: Theme.componentMargin
     property int halfmargin: Theme.componentMargin / 2
 
+    ////////////////////////////////////////////////////////////////////////////
+
+    Component.onCompleted: initBoxData()
+
     Connections {
         target: boxDevice
         function onSensorUpdated() { initBoxData() }
@@ -54,8 +58,6 @@ Item {
         }
     }
 
-    Component.onCompleted: initBoxData()
-
     ////////////////////////////////////////////////////////////////////////////
 
     function initBoxData() {
@@ -223,14 +225,22 @@ Item {
 
         opacity: boxDevice.deviceEnabled ? 1 : 0.66
 
+        RippleThemed {
+            anchors.fill: parent
+            anchor: control
+            clip: true
+
+            pressed: mousearea.pressed
+            active: mousearea.enabled && mousearea.down
+            color: Qt.rgba(Theme.colorForeground.r, Theme.colorForeground.g, Theme.colorForeground.b, 0.8)
+        }
+
         MouseArea {
             id: mousearea
             anchors.fill: parent
             acceptedButtons: Qt.LeftButton | Qt.MiddleButton
 
             onClicked: (mouse) => {
-                if (typeof boxDevice === "undefined" || !boxDevice) return
-
                 if (mouse.button === Qt.LeftButton) {
                     // multi selection
                     if ((mouse.modifiers & Qt.ControlModifier) ||