feat: Top/Left/Right/Bottom Dock positioning

Modules/Dock/Dock.qml

@@ -20,11 +20,13 @@ Variants {
 
         WlrLayershell.namespace: "quickshell:dock"
 
+        readonly property bool isVertical: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right
+
         anchors {
-            top: SettingsData.dockPosition === SettingsData.Position.Top
-            bottom: SettingsData.dockPosition === SettingsData.Position.Bottom
-            left: true
-            right: true
+            top: !isVertical ? (SettingsData.dockPosition === SettingsData.Position.Top) : true
+            bottom: !isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom) : true
+            left: !isVertical ? true : (SettingsData.dockPosition === SettingsData.Position.Left)
+            right: !isVertical ? true : (SettingsData.dockPosition === SettingsData.Position.Right)
         }
 
         property var modelData: item
@@ -35,12 +37,20 @@ Variants {
     readonly property real widgetHeight: Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
     readonly property real effectiveBarHeight: Math.max(widgetHeight + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
     readonly property real barSpacing: {
-        // Only add spacing if bar is visible, horizontal (Top/Bottom), and at same position as dock
         const barIsHorizontal = (SettingsData.dankBarPosition === SettingsData.Position.Top || SettingsData.dankBarPosition === SettingsData.Position.Bottom)
+        const barIsVertical = (SettingsData.dankBarPosition === SettingsData.Position.Left || SettingsData.dankBarPosition === SettingsData.Position.Right)
         const samePosition = (SettingsData.dockPosition === SettingsData.dankBarPosition)
-        return (SettingsData.dankBarVisible && barIsHorizontal && samePosition) 
-            ? (SettingsData.dankBarSpacing + effectiveBarHeight + SettingsData.dankBarBottomGap) 
-            : 0
+        const dockIsHorizontal = !isVertical
+        const dockIsVertical = isVertical
+
+        if (!SettingsData.dankBarVisible) return 0
+        if (dockIsHorizontal && barIsHorizontal && samePosition) {
+            return SettingsData.dankBarSpacing + effectiveBarHeight + SettingsData.dankBarBottomGap
+        }
+        if (dockIsVertical && barIsVertical && samePosition) {
+            return SettingsData.dankBarSpacing + effectiveBarHeight + SettingsData.dankBarBottomGap
+        }
+        return 0
     }
 
     readonly property real dockMargin: SettingsData.dockSpacing
@@ -103,6 +113,83 @@ Variants {
         item: dockMouseArea
     }
 
+    Rectangle {
+        id: appTooltip
+        z: 1000
+
+        property var hoveredButton: {
+            if (!dockApps.children[0]) {
+                return null
+            }
+            const layoutItem = dockApps.children[0]
+            const flowLayout = layoutItem.children[0]
+            let repeater = null
+            for (var i = 0; i < flowLayout.children.length; i++) {
+                const child = flowLayout.children[i]
+                if (child && typeof child.count !== "undefined" && typeof child.itemAt === "function") {
+                    repeater = child
+                    break
+                }
+            }
+            if (!repeater || !repeater.itemAt) {
+                return null
+            }
+            for (var i = 0; i < repeater.count; i++) {
+                const item = repeater.itemAt(i)
+                if (item && item.dockButton && item.dockButton.showTooltip) {
+                    return item.dockButton
+                }
+            }
+            return null
+        }
+
+        property string tooltipText: hoveredButton ? hoveredButton.tooltipText : ""
+
+        visible: hoveredButton !== null && tooltipText !== ""
+        width: px(tooltipLabel.implicitWidth + 24)
+        height: px(tooltipLabel.implicitHeight + 12)
+
+        color: Theme.surfaceContainer
+        radius: Theme.cornerRadius
+        border.width: 1
+        border.color: Theme.outlineMedium
+
+        x: {
+            if (!hoveredButton) return 0
+            const buttonPos = hoveredButton.mapToItem(dock.contentItem, 0, 0)
+            if (!dock.isVertical) {
+                return buttonPos.x + hoveredButton.width / 2 - width / 2
+            } else {
+                if (SettingsData.dockPosition === SettingsData.Position.Right) {
+                    return buttonPos.x - width - Theme.spacingS
+                } else {
+                    return buttonPos.x + hoveredButton.width + Theme.spacingS
+                }
+            }
+        }
+        y: {
+            if (!hoveredButton) return 0
+            const buttonPos = hoveredButton.mapToItem(dock.contentItem, 0, 0)
+            if (!dock.isVertical) {
+                if (SettingsData.dockPosition === SettingsData.Position.Bottom) {
+                    return buttonPos.y - height - Theme.spacingS
+                } else {
+                    return buttonPos.y + hoveredButton.height + Theme.spacingS
+                }
+            } else {
+                return buttonPos.y + hoveredButton.height / 2 - height / 2
+            }
+        }
+
+        StyledText {
+            id: tooltipLabel
+            anchors.centerIn: parent
+            text: appTooltip.tooltipText
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceText
+        }
+    }
+
     Item {
         id: dockCore
         anchors.fill: parent
@@ -125,14 +212,31 @@ Variants {
             id: dockMouseArea
             property real currentScreen: modelData ? modelData : dock.screen
             property real screenWidth: currentScreen ? currentScreen.geometry.width : 1920
+            property real screenHeight: currentScreen ? currentScreen.geometry.height : 1080
             property real maxDockWidth: Math.min(screenWidth * 0.8, 1200)
+            property real maxDockHeight: Math.min(screenHeight * 0.8, 1200)
 
-            height: dock.reveal ? px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap) : 1
-            width: dock.reveal ? Math.min(dockBackground.implicitWidth + 32, maxDockWidth) : Math.min(Math.max(dockBackground.implicitWidth + 64, 200), screenWidth * 0.5)
+            height: {
+                if (dock.isVertical) {
+                    return dock.reveal ? Math.min(dockBackground.implicitHeight + 32, maxDockHeight) : Math.min(Math.max(dockBackground.implicitHeight + 64, 200), screenHeight * 0.5)
+                } else {
+                    return dock.reveal ? px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap) : 1
+                }
+            }
+            width: {
+                if (dock.isVertical) {
+                    return dock.reveal ? px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap) : 1
+                } else {
+                    return dock.reveal ? Math.min(dockBackground.implicitWidth + 32, maxDockWidth) : Math.min(Math.max(dockBackground.implicitWidth + 64, 200), screenWidth * 0.5)
+                }
+            }
             anchors {
-                top: SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top
-                bottom: SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined
-                horizontalCenter: parent.horizontalCenter
+                top: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top) : undefined
+                bottom: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined) : undefined
+                horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
+                left: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.left) : undefined
+                right: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined) : undefined
+                verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
             }
             hoverEnabled: true
             acceptedButtons: Qt.NoButton
@@ -144,6 +248,12 @@ Variants {
                 }
             }
 
+            Behavior on width {
+                NumberAnimation {
+                    duration: 200
+                    easing.type: Easing.OutCubic
+                }
+            }
 
             Item {
                 id: dockContainer
@@ -151,7 +261,17 @@ Variants {
 
                 transform: Translate {
                     id: dockSlide
+                    x: {
+                        if (!dock.isVertical) return 0
+                        if (dock.reveal) return 0
+                        if (SettingsData.dockPosition === SettingsData.Position.Right) {
+                            return 60
+                        } else {
+                            return -60
+                        }
+                    }
                     y: {
+                        if (dock.isVertical) return 0
                         if (dock.reveal) return 0
                         if (SettingsData.dockPosition === SettingsData.Position.Bottom) {
                             return 60
@@ -160,6 +280,13 @@ Variants {
                         }
                     }
 
+                    Behavior on x {
+                        NumberAnimation {
+                            duration: 200
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+
                     Behavior on y {
                         NumberAnimation {
                             duration: 200
@@ -172,15 +299,20 @@ Variants {
                     id: dockBackground
                     objectName: "dockBackground"
                     anchors {
-                        top: SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top
-                        bottom: SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined
-                        horizontalCenter: parent.horizontalCenter
+                        top: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top) : undefined
+                        bottom: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined) : undefined
+                        horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
+                        left: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.left) : undefined
+                        right: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined) : undefined
+                        verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
                     }
-                    anchors.topMargin: SettingsData.dockPosition === SettingsData.Position.Bottom ? 0 : barSpacing + 4
-                    anchors.bottomMargin: SettingsData.dockPosition === SettingsData.Position.Bottom ? barSpacing + 1 : 0
+                    anchors.topMargin: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? 0 : barSpacing + 4) : 0
+                    anchors.bottomMargin: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? barSpacing + 1 : 0) : 0
+                    anchors.leftMargin: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? 0 : barSpacing + 4) : 0
+                    anchors.rightMargin: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? barSpacing + 1 : 0) : 0
 
-                    implicitWidth: dockApps.implicitWidth + SettingsData.dockSpacing * 2
-                    implicitHeight: dockApps.implicitHeight + SettingsData.dockSpacing * 2
+                    implicitWidth: dock.isVertical ? (dockApps.implicitHeight + SettingsData.dockSpacing * 2) : (dockApps.implicitWidth + SettingsData.dockSpacing * 2)
+                    implicitHeight: dock.isVertical ? (dockApps.implicitWidth + SettingsData.dockSpacing * 2) : (dockApps.implicitHeight + SettingsData.dockSpacing * 2)
                     width: implicitWidth
                     height: implicitHeight
 
@@ -199,69 +331,24 @@ Variants {
                     DockApps {
                         id: dockApps
 
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.topMargin: SettingsData.dockSpacing
-                        anchors.bottomMargin: SettingsData.dockSpacing
+                        anchors.top: !dock.isVertical ? parent.top : undefined
+                        anchors.bottom: !dock.isVertical ? parent.bottom : undefined
+                        anchors.horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
+                        anchors.left: dock.isVertical ? parent.left : undefined
+                        anchors.right: dock.isVertical ? parent.right : undefined
+                        anchors.verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
+                        anchors.topMargin: !dock.isVertical ? SettingsData.dockSpacing : 0
+                        anchors.bottomMargin: !dock.isVertical ? SettingsData.dockSpacing : 0
+                        anchors.leftMargin: dock.isVertical ? SettingsData.dockSpacing : 0
+                        anchors.rightMargin: dock.isVertical ? SettingsData.dockSpacing : 0
 
                         contextMenu: dockVariants.contextMenu
                         groupByApp: dock.groupByApp
+                        isVertical: dock.isVertical
                     }
                 }
-
-            Rectangle {
-                id: appTooltip
-
-                property var hoveredButton: {
-                    if (!dockApps.children[0]) {
-                        return null
-                    }
-                    const row = dockApps.children[0]
-                    let repeater = null
-                    for (var i = 0; i < row.children.length; i++) {
-                        const child = row.children[i]
-                        if (child && typeof child.count !== "undefined" && typeof child.itemAt === "function") {
-                            repeater = child
-                            break
-                        }
-                    }
-                    if (!repeater || !repeater.itemAt) {
-                        return null
-                    }
-                    for (var i = 0; i < repeater.count; i++) {
-                        const item = repeater.itemAt(i)
-                        if (item && item.dockButton && item.dockButton.showTooltip) {
-                            return item.dockButton
-                        }
-                    }
-                    return null
-                }
-
-                property string tooltipText: hoveredButton ? hoveredButton.tooltipText : ""
-
-                visible: hoveredButton !== null && tooltipText !== ""
-                width: px(tooltipLabel.implicitWidth + 24)
-                height: px(tooltipLabel.implicitHeight + 12)
-
-                color: Theme.surfaceContainer
-                radius: Theme.cornerRadius
-                border.width: 1
-                border.color: Theme.outlineMedium
-
-                y: SettingsData.dockPosition === SettingsData.Position.Bottom ? -height - Theme.spacingS : parent.height + Theme.spacingS
-                x: hoveredButton ? hoveredButton.mapToItem(dockContainer, hoveredButton.width / 2, 0).x - width / 2 : 0
-
-                StyledText {
-                    id: tooltipLabel
-                    anchors.centerIn: parent
-                    text: appTooltip.tooltipText
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                }
             }
         }
         }
-        }
     }
 }