meta: Vertical Bar, Notification Popup Position Options, ++

- CC Color picker widget - Tooltips in more places - Attempt to improve niri screen transitiosn
2025-12-06 05:25:41 -05:00 · 2025-09-30 09:51:18 -04:00
parent d280505b9f
commit e875d1a5d7
84 changed files with 4937 additions and 2019 deletions
--- a/Modules/DankBar/Widgets/NetworkMonitor.qml
+++ b/Modules/DankBar/Widgets/NetworkMonitor.qml
@@ -0,0 +1,193 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Common
+import qs.Modules.ProcessList
+import qs.Services
+import qs.Widgets
+
+Rectangle {
+    id: root
+
+    property bool isVertical: axis?.isVertical ?? false
+    property var axis: null
+    property int availableWidth: 400
+    readonly property int baseWidth: contentRow.implicitWidth + Theme.spacingS * 2
+    readonly property int maxNormalWidth: 456
+    property real widgetThickness: 30
+    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+
+    function formatNetworkSpeed(bytesPerSec) {
+        if (bytesPerSec < 1024) {
+            return bytesPerSec.toFixed(0) + " B/s";
+        } else if (bytesPerSec < 1024 * 1024) {
+            return (bytesPerSec / 1024).toFixed(1) + " KB/s";
+        } else if (bytesPerSec < 1024 * 1024 * 1024) {
+            return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
+        } else {
+            return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
+        }
+    }
+
+    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
+    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
+    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+    color: {
+        if (SettingsData.dankBarNoBackground) {
+            return "transparent";
+        }
+
+        const baseColor = networkArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
+        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
+    }
+    Component.onCompleted: {
+        DgopService.addRef(["network"]);
+    }
+    Component.onDestruction: {
+        DgopService.removeRef(["network"]);
+    }
+
+    MouseArea {
+        id: networkArea
+
+        anchors.fill: parent
+        hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
+    }
+
+    Column {
+        id: contentColumn
+
+        anchors.centerIn: parent
+        spacing: 2
+        visible: root.isVertical
+
+        DankIcon {
+            name: "network_check"
+            size: Theme.iconSize - 8
+            color: Theme.surfaceText
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        StyledText {
+            text: {
+                const rate = DgopService.networkRxRate
+                if (rate < 1024) return rate.toFixed(0)
+                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
+                return (rate / (1024 * 1024)).toFixed(0) + "M"
+            }
+            font.pixelSize: Theme.fontSizeSmall
+            font.weight: Font.Medium
+            color: Theme.info
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        StyledText {
+            text: {
+                const rate = DgopService.networkTxRate
+                if (rate < 1024) return rate.toFixed(0)
+                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
+                return (rate / (1024 * 1024)).toFixed(0) + "M"
+            }
+            font.pixelSize: Theme.fontSizeSmall
+            font.weight: Font.Medium
+            color: Theme.error
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    Row {
+        id: contentRow
+
+        anchors.centerIn: parent
+        spacing: Theme.spacingS
+        visible: !root.isVertical
+
+        DankIcon {
+            name: "network_check"
+            size: Theme.iconSize - 8
+            color: Theme.surfaceText
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Row {
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: 4
+
+            StyledText {
+                text: "↓"
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.info
+            }
+
+            StyledText {
+                text: DgopService.networkRxRate > 0 ? formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
+                font.pixelSize: Theme.fontSizeSmall
+                font.weight: Font.Medium
+                color: Theme.surfaceText
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignLeft
+                elide: Text.ElideNone
+                wrapMode: Text.NoWrap
+
+                StyledTextMetrics {
+                    id: rxBaseline
+                    font.pixelSize: Theme.fontSizeSmall
+                    font.weight: Font.Medium
+                    text: "88.8 MB/s"
+                }
+
+                width: Math.max(rxBaseline.width, paintedWidth)
+
+                Behavior on width {
+                    NumberAnimation {
+                        duration: 120
+                        easing.type: Easing.OutCubic
+                    }
+                }
+            }
+
+        }
+
+        Row {
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: 4
+
+            StyledText {
+                text: "↑"
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.error
+            }
+
+            StyledText {
+                text: DgopService.networkTxRate > 0 ? formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
+                font.pixelSize: Theme.fontSizeSmall
+                font.weight: Font.Medium
+                color: Theme.surfaceText
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignLeft
+                elide: Text.ElideNone
+                wrapMode: Text.NoWrap
+
+                StyledTextMetrics {
+                    id: txBaseline
+                    font.pixelSize: Theme.fontSizeSmall
+                    font.weight: Font.Medium
+                    text: "88.8 MB/s"
+                }
+
+                width: Math.max(txBaseline.width, paintedWidth)
+
+                Behavior on width {
+                    NumberAnimation {
+                        duration: 120
+                        easing.type: Easing.OutCubic
+                    }
+                }
+            }
+
+        }
+
+    }
+
+
+}