some random fixes to quickshell

2026-07-06 12:44:32 +02:00
parent b51fcfd99c
commit d77e692e75
12 changed files with 39 additions and 22 deletions
@@ -2,5 +2,4 @@ file:///home/kolkas/Videos Videos
 file:///home/kolkas/Repositories Repositories
 file:///home/kolkas/Pictures Pictures
 file:///home/kolkas/Desktop Desktop
-file:///home/kolkas/Public/GRA%20Proj Next
-file:///home/kolkas/Public/GRA%20Proj/
+file:///media/Media Media
@@ -10,7 +10,7 @@ ScrollView {
  property color handleHoverColor: handleColor
  property color handlePressedColor: handleColor
  property color trackColor: "transparent"
-  property real handleWidth: Math.round(6 * Style.uiScaleRatio)
+  property real handleWidth: 6
  property real handleRadius: Style.radiusM
  property int verticalPolicy: ScrollBar.AsNeeded
  property int horizontalPolicy: ScrollBar.AsNeeded
@@ -25,6 +25,7 @@ Rectangle {
            clip: true

            UText {
+                width: parent.width
                text: LyricsService.isFetchingLyrics ? "Fetching..." : (LyricsService.lyrics.get(LyricsService.currentIndex)?.line ?? "No lyrics available")
                family: Fonts.sans
                pointSize: Style.fontSizeM
@@ -628,14 +628,19 @@ Variants {
                    spacing: Style.marginS

                    // Header with urgency indicator
-                    RowLayout {
+                    Row {
+                      id: notificationHeaderRow
+
                      Layout.fillWidth: true
+                      Layout.rightMargin: Style.marginXL
                      spacing: Style.marginS

                      Rectangle {
-                        Layout.preferredWidth: 6
-                        Layout.preferredHeight: 6
-                        Layout.alignment: Qt.AlignVCenter
+                        id: urgencyDot
+
+                        width: 6
+                        height: 6
+                        anchors.verticalCenter: parent.verticalCenter
                        radius: Style.radiusXS
                        color: model.urgency === 2 ? Colors.mError : model.urgency === 0 ? Colors.mOnSurface : Colors.mPrimary
                      }
@@ -645,18 +650,18 @@ Variants {
                        pointSize: Style.fontSizeXS
                        font.weight: Style.fontWeightBold
                        color: Colors.mPrimary
+                        elide: Text.ElideRight
+                        width: Math.max(0, Math.min(implicitWidth, notificationHeaderRow.width - urgencyDot.width - notificationHeaderRow.spacing * 2 - notificationTimestampText.implicitWidth))
                      }

                      UText {
+                        id: notificationTimestampText
+
                        textFormat: Text.PlainText
                        text: " " + Time.formatRelativeTime(model.timestamp)
                        pointSize: Style.fontSizeXXS
                        color: Colors.mOnSurfaceVariant
-                        Layout.alignment: Qt.AlignBottom
-                      }
-
-                      Item {
-                        Layout.fillWidth: true
+                        anchors.bottom: parent.bottom
                      }
                    }

@@ -729,11 +729,15 @@ Rectangle {

                                                // Header row with app name and timestamp
                                                Row {
+                                                    id: notificationHeaderRow
+
                                                    width: parent.width
                                                    spacing: Style.marginS

                                                    // Urgency indicator
                                                    Rectangle {
+                                                        id: urgencyIndicator
+
                                                        width: 6
                                                        height: 6
                                                        anchors.verticalCenter: parent.verticalCenter
@@ -754,9 +758,13 @@ Rectangle {
                                                        pointSize: Style.fontSizeXS
                                                        font.weight: Style.fontWeightBold
                                                        color: Colors.mPrimary
+                                                        elide: Text.ElideRight
+                                                        width: Math.max(0, Math.min(implicitWidth, notificationHeaderRow.width - (urgencyIndicator.visible ? urgencyIndicator.width + notificationHeaderRow.spacing : 0) - notificationHeaderRow.spacing - notificationTimestampText.implicitWidth))
                                                    }

                                                    UText {
+                                                        id: notificationTimestampText
+
                                                        textFormat: Text.PlainText
                                                        text: " " + Time.formatRelativeTime(model.timestamp)
                                                        pointSize: Style.fontSizeXXS
@@ -38,9 +38,11 @@ UBox {
                    }

                    ColumnLayout {
+                        Layout.fillWidth: true
                        spacing: Style.marginXS

                        UText {
+                            Layout.fillWidth: true
                            text: `${HostService.username} @ ${HostService.hostname}`
                            font.weight: Style.fontWeightBold
                            font.pointSize: Style.fontSizeL
@@ -11,7 +11,7 @@ import qs.Utils
 UBox {
    id: root

-    property int forecastDays: 6
+    property int forecastDays: 5
    property bool showLocation: true
    property bool showEffects: true
    readonly property bool weatherReady: LocationService.data.weather !== null
@@ -1,11 +1,11 @@
 [[plugin.deps]]
 use = "yazi-rs/plugins:git"
-rev = "38efe09"
+rev = "5d461d8"
 hash = "88e56a64b7ce7c4314427452343fef17"

 [[plugin.deps]]
 use = "yazi-rs/plugins:smart-enter"
-rev = "38efe09"
+rev = "5d461d8"
 hash = "187cc58ba7ac3befd49c342129e6f1b6"

 [[plugin.deps]]