Start: linked to Apps it becomes the launcher; Apps and Start feel like the dock

With Start and Apps linked, the launcher opens out of the Start module: the
module grows into it as a bar panel, and the dock lends it the launcher's own
face (one face, so search, selection and modes are the same launcher) until
the panel has shut. Every way in opens it there except the dock's own button,
which still grows the dock into it. The dock follows the launcher with
menuInDock where it draws or takes input, menuOpen where the launcher itself
is meant. The link counts on the full bar too, which draws no joins.

Apps: icons swell and lift off the bar on hover, squash under a press and
spring back, kick as an app launches, and new ones grow in. The indicator is
the dock's: a segment a window, longer in focus, red and breathing when a
window wants attention, and a breathing dot until a launched app's first
window comes. The tooltip slides out from the bar. Start squashes under a
press; the Distro look no longer loads its icon off the main thread.

A panel now closes as long as it opens, slow at first and soft at the end:
the exit curve finished at 90 px a frame and read as too quick.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Sn3aky
2026-11-06 10:19:43 +01:00
Unverified
parent fcbbeec079
commit 45f4148c1a
7 changed files with 527 additions and 194 deletions
+232 -36
View File
@@ -91,6 +91,14 @@ BarPill {
}
// the panel shows the apps that did not fit, rather than one app
property bool overflowOpen: false
// cells made once the module is up grow in; the first ones are just there
property bool cellsReady: false
Timer {
running: true
interval: 1500
onTriggered: root.cellsReady = true
}
readonly property var chosenItem: root.items.find((i) => {
return i.appId === root.chosen;
}) || null
@@ -457,12 +465,67 @@ BarPill {
readonly property var app: root.placed.shown[cell.index] || root.noApp
readonly property var wins: root.windowsOf(cell.app.appId)
readonly property bool focused: cell.wins.indexOf(Hyprland.activeToplevel) >= 0
readonly property bool urgent: cell.wins.some((t) => {
return t.urgent === true;
})
readonly property bool held: root.dragFrom === cell.index
readonly property bool hot: cellArea.containsMouse && !cell.held
readonly property bool pressed: cellArea.pressed && !cellArea.dragged
// launched from here: its dot breathes until the first window comes
property bool launching: false
// set once as it is made: a binding would empty every cell when the module comes up
property real born: 1
function launchNow() {
if (cell.wins.length === 0) {
cell.launching = true;
launchTimeout.restart();
}
cellJelly.kickAfter(0.16, Theme.ms(60));
}
width: root.slot
height: root.compactHeight
// the held icon is drawn in the overlay, where it can leave the bar
opacity: cell.held ? 0 : 1
opacity: cell.held ? 0 : cell.born
onWinsChanged: {
if (cell.wins.length > 0)
cell.launching = false;
}
// as the dock's icons do: a kick as the pointer comes, a squash
// under the press and a spring back off it
onHotChanged: {
if (cell.hot)
cellJelly.kick(0.09);
}
onPressedChanged: cellJelly.kick(cell.pressed ? -0.13 : 0.1)
Component.onCompleted: {
if (!root.cellsReady)
return ;
cell.born = 0;
bornAnim.start();
}
NumberAnimation {
id: bornAnim
target: cell
property: "born"
to: 1
duration: Theme.durMedium
easing.type: Easing.Bezier
easing.bezierCurve: Theme.easeEmphasizedDecel
}
Timer {
id: launchTimeout
interval: 10000
onTriggered: cell.launching = false
}
transform: Translate {
x: root.shiftOf(cell.index)
@@ -480,51 +543,155 @@ BarPill {
}
Rectangle {
visible: Prefs.dockIconTiles
anchors.centerIn: parent
width: root.slot - Theme.dp(4)
height: root.compactHeight - Theme.dp(8)
radius: Theme.radiusMd
color: Theme.withBlur(Theme.bgTile)
}
// hover swells the icon and lifts it off the bar's edge, a press
// squashes it; a new cell grows in
Item {
id: face
Rectangle {
anchors.centerIn: parent
width: root.slot - Theme.dp(4)
height: root.compactHeight - Theme.dp(8)
radius: Theme.radiusMd
color: Theme.alpha(Theme.text, cellArea.containsMouse ? 0.1 : (cell.focused ? 0.06 : 0))
readonly property bool jellyWobbling: cellJelly.wobbling
Behavior on color {
ColorAnimation {
anchors.fill: parent
scale: (cell.pressed ? 0.88 : (cell.hot ? 1 + 0.1 * Prefs.dockHoverEffect : 1)) * (0.6 + 0.4 * cell.born)
transform: [
Translate {
y: cell.hot && !cell.pressed ? Math.round(Theme.dp(2) * Prefs.dockHoverEffect) : 0
Behavior on y {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.OutCubic
}
}
},
Jelly {
id: cellJelly
target: face
anchorY: 0
frequency: 5.5
}
]
Rectangle {
visible: Prefs.dockIconTiles
anchors.centerIn: parent
width: root.slot - Theme.dp(4)
height: root.compactHeight - Theme.dp(8)
radius: Theme.radiusMd
color: Theme.withBlur(Theme.bgTile)
}
Rectangle {
anchors.centerIn: parent
width: root.slot - Theme.dp(4)
height: root.compactHeight - Theme.dp(8)
radius: Theme.radiusMd
color: Theme.text
opacity: cell.pressed ? 0.14 : (cell.hot ? 0.1 : (cell.focused ? 0.06 : 0))
Behavior on opacity {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.OutCubic
}
}
}
BarAppIcon {
anchors.centerIn: parent
size: root.glyph
app: cell.app
source: root.iconOf(cell.app.icon)
hovered: cell.hot
}
Behavior on scale {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.OutBack
easing.overshoot: 1.6
}
}
}
BarAppIcon {
anchors.centerIn: parent
size: root.glyph
app: cell.app
source: root.iconOf(cell.app.icon)
hovered: cellArea.containsMouse
}
// as the dock's: a segment for each window, up to three, longer on
// the app in focus; red and breathing while one wants attention,
// and a breathing dot while a launch is on its way
Row {
id: indicator
readonly property int segments: Math.max(1, Math.min(3, cell.wins.length))
readonly property real segW: cell.focused ? (indicator.segments === 1 ? Theme.dp(12) : Theme.dp(6)) : Theme.dp(4)
readonly property bool breathing: (cell.urgent || (cell.launching && cell.wins.length === 0)) && root.shown && indicator.visible
property real pulse: 1
// open windows: a dot, stretched into a bar for the focused one
Rectangle {
visible: Prefs.dockShowIndicators && cell.wins.length > 0
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.dp(3)
width: cell.focused ? Theme.dp(12) : Theme.dp(4)
height: Theme.dp(3)
radius: height / 2
color: cell.focused ? Theme.accent : Theme.alpha(Theme.text, 0.6)
spacing: Theme.dp(2)
opacity: Prefs.dockShowIndicators && (cell.wins.length > 0 || cell.launching) ? 1 : 0
visible: indicator.opacity > 0
Behavior on width {
Repeater {
model: indicator.segments
Rectangle {
width: indicator.segW
height: Theme.dp(3)
radius: height / 2
opacity: indicator.pulse
color: cell.urgent ? Theme.error : (cell.focused ? Theme.accent : Theme.alpha(Theme.text, 0.6))
Behavior on width {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.Bezier
easing.bezierCurve: Theme.easeEmphasizedDecel
}
}
Behavior on color {
ColorAnimation {
duration: Theme.durShort
}
}
}
}
SequentialAnimation on pulse {
running: indicator.breathing
loops: Animation.Infinite
onRunningChanged: {
if (!running)
indicator.pulse = 1;
}
NumberAnimation {
to: 0.3
duration: Theme.ms(500)
easing.type: Easing.InOutSine
}
NumberAnimation {
to: 1
duration: Theme.ms(500)
easing.type: Easing.InOutSine
}
}
Behavior on opacity {
NumberAnimation {
duration: Theme.durShort
}
@@ -598,12 +765,17 @@ BarPill {
return ;
root.hover(null);
if (mouse.button === Qt.RightButton)
if (mouse.button === Qt.RightButton) {
root.openFor(cell.app);
else if (mouse.button === Qt.MiddleButton)
} else if (mouse.button === Qt.MiddleButton) {
cell.launchNow();
root.launch(cell.app);
else
} else {
if (cell.wins.length === 0)
cell.launchNow();
root.activate(cell.app);
}
}
}
@@ -620,13 +792,33 @@ BarPill {
visible: root.placed.rest.length > 0
width: root.slot
height: root.compactHeight
scale: moreArea.pressed ? 0.88 : 1
Rectangle {
anchors.centerIn: parent
width: root.slot - Theme.dp(4)
height: root.compactHeight - Theme.dp(8)
radius: Theme.radiusMd
color: Theme.alpha(Theme.text, moreArea.containsMouse ? 0.1 : 0)
color: Theme.text
opacity: moreArea.pressed ? 0.14 : (moreArea.containsMouse ? 0.1 : 0)
Behavior on opacity {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.OutCubic
}
}
}
Behavior on scale {
NumberAnimation {
duration: Theme.durShort
easing.type: Easing.OutBack
easing.overshoot: 1.6
}
}
Text {
@@ -706,6 +898,10 @@ BarPill {
opacity: root.tipOpen ? 1 : 0
visible: opacity > 0.01
transform: Translate {
y: (1 - tip.opacity) * (root.tipAbove ? Theme.dp(4) : -Theme.dp(4))
}
Column {
id: tipColumn
+11 -9
View File
@@ -173,7 +173,7 @@ Item {
jelly.rest();
pillJelly.kickAfter(-0.15, Math.round(Theme.barDurExit * 0.9));
} else {
jelly.kickAfter(-0.15, Math.round(Theme.barDurExit * 0.9));
jelly.kickAfter(-0.15, Math.round(pill.morphDuration * 0.7));
}
openWobble.restart();
}
@@ -209,15 +209,17 @@ Item {
property int popupMorphDuration: pill.morphDuration
property var popupMorphCurve: Theme.easeEmphasizedDecel
// a close shrinks on the exit curve, slow at first, so whatever the panel
// pushed aside follows it back instead of jumping in the first frame. only
// while it closes: the face's own width changes keep the enter curve
// a close takes as long as the open, but slow at first and soft at the end:
// the enter curve went most of the way in its first frame, and whatever the
// panel pushed aside jumped back. only while it closes: the face's own width
// changes keep the enter curve
property bool closing: false
readonly property var closeCurve: [0.4, 0, 0.2, 1, 1, 1]
Timer {
id: closingTimer
interval: Theme.barDurExit
interval: pill.morphDuration
onTriggered: pill.closing = false
}
@@ -457,9 +459,9 @@ Item {
Behavior on implicitWidth {
NumberAnimation {
duration: pill.exiting ? Theme.barMs(360) : (pill.closing ? Theme.barDurExit : pill.morphDuration)
duration: pill.exiting ? Theme.barMs(360) : pill.morphDuration
easing.type: Easing.Bezier
easing.bezierCurve: pill.exiting ? Theme.curveStandard : (pill.closing ? Theme.easeEmphasizedAccel : pill.morphEasing)
easing.bezierCurve: pill.exiting ? Theme.curveStandard : (pill.closing ? pill.closeCurve : pill.morphEasing)
}
}
@@ -536,9 +538,9 @@ Item {
}
NumberAnimation {
duration: pill.exiting ? 0 : (pill.closing ? Theme.barDurExit : pill.morphDuration)
duration: pill.exiting ? 0 : pill.morphDuration
easing.type: Easing.Bezier
easing.bezierCurve: pill.closing ? Theme.easeEmphasizedAccel : pill.morphEasing
easing.bezierCurve: pill.closing ? pill.closeCurve : pill.morphEasing
}
}
+162 -97
View File
@@ -14,6 +14,10 @@ BarPill {
property var dockMod: null
readonly property bool launcherOpen: !!root.dockMod && root.dockMod.menuOpen
// linked to the Apps module, the launcher opens out of this module: it grows
// into the launcher, the dock lending it the launcher's face meanwhile
readonly property bool hosting: !!root.dockMod && root.dockMod.launcherHost === root
readonly property Item faceSlot: launcherSlot
lookPref: Prefs.startModuleStyle
readonly property bool gridFace: root.look === "grid"
// the distribution's logo, the account picture, or a word; the logo falls
@@ -45,6 +49,36 @@ BarPill {
compactHovered: startArea.containsMouse
shown: Prefs.showStart && root.dockMod !== null
compactWidth: root.labelFace ? root.chipWidth + root.compactHeight - root.chipHeight : root.compactHeight
panelWidth: root.dockMod ? Math.round(root.dockMod.menuWidth) : Theme.dp(480)
panelHeight: root.dockMod ? Math.round(root.dockMod.menuHeight) : Theme.dp(400)
expandedRadius: Theme.shapeXl
onHostingChanged: {
if (root.hosting)
faceHome.stop();
root.expanded = root.hosting;
}
onExpandedChanged: {
// shut from the bar's side, by a click away say
if (!root.expanded && root.hosting)
root.dockMod.menuOpen = false;
if (!root.expanded)
faceHome.restart();
}
// the face goes back to the dock once the panel has shut
Timer {
id: faceHome
interval: Theme.barDurEnter + Theme.barMs(120)
onTriggered: {
if (root.dockMod)
root.dockMod.returnFace(root);
}
}
FileView {
id: osRelease
@@ -70,109 +104,129 @@ BarPill {
}
},
// Lucid's mark (assets/logo-mark.svg), as at the top of the launcher
Shape {
visible: root.markFace
anchors.centerIn: parent
width: root.glyph
height: root.glyph
preferredRendererType: Shape.CurveRenderer
// pressed, the face squashes and springs back as it is let go
Item {
anchors.fill: parent
scale: startArea.pressed ? 0.86 : 1
ShapePath {
strokeColor: Theme.accent
strokeWidth: 3
fillColor: "transparent"
capStyle: ShapePath.RoundCap
PathSvg {
path: "M15.92,5.72 A7.4,7.4 0 1 0 18.95,14.53"
Behavior on scale {
NumberAnimation {
duration: Theme.durMedium
easing.type: Easing.OutBack
easing.overshoot: 1.8
}
}
ShapePath {
strokeWidth: 0
fillColor: Theme.text
PathSvg {
path: "M12,7.4 C12.598,10.62 13.38,11.402 16.6,12 C13.38,12.598 12.598,13.38 12,16.6 C11.402,13.38 10.62,12.598 7.4,12 C10.62,11.402 11.402,10.62 12,7.4 Z"
}
}
ShapePath {
strokeWidth: 0
fillColor: Theme.accent
PathSvg {
path: "M20,9.4 A1,1 0 1 0 22,9.4 A1,1 0 1 0 20,9.4 Z"
}
}
transform: Scale {
xScale: root.glyph / 24
yScale: root.glyph / 24
}
},
// or the dock's launcher button, lit as the dock lights it. its squares
// span about half its box, which puts them at the bar's icon size
UI.LauncherGrid {
visible: root.gridFace
anchors.centerIn: parent
width: Math.round(root.glyph * 1.3)
height: width
lit: startArea.containsMouse || root.launcherOpen
},
// Distro: the logo /etc/os-release names, in the accent
Image {
id: distroLogo
visible: false
width: root.glyph
height: root.glyph
source: Prefs.startModuleStyle === "distro" ? root.osLogoSource : ""
sourceSize.width: root.glyph * 2
sourceSize.height: root.glyph * 2
fillMode: Image.PreserveAspectFit
asynchronous: true
},
MultiEffect {
visible: root.distroFace
anchors.centerIn: parent
width: root.glyph
height: root.glyph
source: distroLogo
colorization: 1
colorizationColor: Theme.accent
brightness: 0.25
},
// Avatar: the account picture, round
UserAvatar {
visible: root.avatarFace
anchors.centerIn: parent
user: Users.me
size: root.glyph + Theme.dp(2)
},
// Label: the word, on a chip in the accent
Rectangle {
visible: root.labelFace
anchors.centerIn: parent
width: root.chipWidth
height: root.chipHeight
radius: Theme.pill(height)
color: root.launcherOpen ? Theme.accentHover : Theme.accent
Text {
id: startLabel
// Lucid's mark (assets/logo-mark.svg), as at the top of the launcher
Shape {
visible: root.markFace
anchors.centerIn: parent
text: "Start"
color: Theme.fgAccent
font.family: Theme.fontFamily
font.bold: true
font.pixelSize: Theme.fs(12)
width: root.glyph
height: root.glyph
preferredRendererType: Shape.CurveRenderer
ShapePath {
strokeColor: Theme.accent
strokeWidth: 3
fillColor: "transparent"
capStyle: ShapePath.RoundCap
PathSvg {
path: "M15.92,5.72 A7.4,7.4 0 1 0 18.95,14.53"
}
}
ShapePath {
strokeWidth: 0
fillColor: Theme.text
PathSvg {
path: "M12,7.4 C12.598,10.62 13.38,11.402 16.6,12 C13.38,12.598 12.598,13.38 12,16.6 C11.402,13.38 10.62,12.598 7.4,12 C10.62,11.402 11.402,10.62 12,7.4 Z"
}
}
ShapePath {
strokeWidth: 0
fillColor: Theme.accent
PathSvg {
path: "M20,9.4 A1,1 0 1 0 22,9.4 A1,1 0 1 0 20,9.4 Z"
}
}
transform: Scale {
xScale: root.glyph / 24
yScale: root.glyph / 24
}
}
// or the dock's launcher button, lit as the dock lights it. its squares
// span about half its box, which puts them at the bar's icon size
UI.LauncherGrid {
visible: root.gridFace
anchors.centerIn: parent
width: Math.round(root.glyph * 1.3)
height: width
lit: startArea.containsMouse || root.launcherOpen
}
// Distro: the logo /etc/os-release names, in the accent
Image {
id: distroLogo
visible: false
width: root.glyph
height: root.glyph
source: Prefs.startModuleStyle === "distro" ? root.osLogoSource : ""
sourceSize.width: root.glyph * 2
sourceSize.height: root.glyph * 2
fillMode: Image.PreserveAspectFit
}
MultiEffect {
visible: root.distroFace
anchors.centerIn: parent
width: root.glyph
height: root.glyph
source: distroLogo
colorization: 1
colorizationColor: Theme.accent
brightness: 0.25
}
// Avatar: the account picture, round
UserAvatar {
visible: root.avatarFace
anchors.centerIn: parent
user: Users.me
size: root.glyph + Theme.dp(2)
}
// Label: the word, on a chip in the accent
Rectangle {
visible: root.labelFace
anchors.centerIn: parent
width: root.chipWidth
height: root.chipHeight
radius: Theme.pill(height)
color: root.launcherOpen ? Theme.accentHover : Theme.accent
Text {
id: startLabel
anchors.centerIn: parent
text: "Start"
color: Theme.fgAccent
font.family: Theme.fontFamily
font.bold: true
font.pixelSize: Theme.fs(12)
}
}
},
@@ -198,4 +252,15 @@ BarPill {
}
}
]
panelContent: [
// where the dock's launcher face sits while this module is the launcher
Item {
id: launcherSlot
anchors.centerIn: parent
width: root.dockMod ? root.dockMod.menuWidth - root.dockMod.panelPadding : 0
height: root.dockMod ? root.dockMod.menuHeight - root.dockMod.panelPadding : 0
}
]
}
+97 -45
View File
@@ -18,7 +18,7 @@ PanelWindow {
property bool morphing: false
property bool closingFromHidden: false
readonly property bool dockBusy: dockWindow.menuOpen || dockWindow.dragging || (dockWindow.morphing && !dockWindow.launcherFromHidden && !dockWindow.closingFromHidden)
readonly property bool dockBusy: dockWindow.menuInDock || dockWindow.dragging || (dockWindow.morphing && !dockWindow.launcherFromHidden && !dockWindow.closingFromHidden)
property bool slidingAway: false
readonly property bool heldByPointer: revealArea.containsMouse || (shellHover.hovered && !dockWindow.slidingAway)
// on screen in its own right; a disabled dock never is
@@ -91,7 +91,7 @@ PanelWindow {
readonly property int splitGap: Theme.dp(Prefs.dockSplitGap)
// 1 while the islands stand apart, 0 once they are one slab
property real seam: 0
readonly property bool splitWanted: Prefs.dockSplit && !dockWindow.menuOpen && !dockWindow.launcherFromHidden
readonly property bool splitWanted: Prefs.dockSplit && !dockWindow.menuInDock && !dockWindow.launcherFromHidden
readonly property bool splitDrawn: Prefs.dockSplit && dockWindow.seam > 0.001
onSplitWantedChanged: {
@@ -161,13 +161,13 @@ PanelWindow {
// the last pixel left at the screen edge would show as a line over a bar
readonly property real hiddenOffset: dockWindow.dockRevealed ? 0 : -(shell.implicitHeight + dockWindow.placementMargin - (dockWindow.onBar ? 0 : 1))
// a disabled dock's panel exists only while the launcher is up or shrinking away
readonly property bool shellShown: Prefs.dockOn || dockWindow.menuOpen || dockWindow.morphing
readonly property bool shellShown: Prefs.dockOn || dockWindow.menuInDock || dockWindow.morphing
onDockRevealedChanged: {
if (dockWindow.dockRevealed) {
dockWindow.slidingAway = false;
slideAwayTimer.stop();
if (!dockWindow.menuOpen && !dockWindow.morphing && !dockWindow.dragging && !dockWindow.snapPlacement)
if (!dockWindow.menuInDock && !dockWindow.morphing && !dockWindow.dragging && !dockWindow.snapPlacement)
dockJelly.kickAfter(0.12, Math.round(Theme.durLong * 0.35));
} else {
@@ -366,7 +366,7 @@ PanelWindow {
dockWindow.osdFaceFade = 100;
dockWindow.dockFaceDelay = 90;
dockWindow.dockFaceFade = 200;
if (!dockWindow.menuOpen) {
if (!dockWindow.menuInDock) {
dockWindow.morphOsd(Theme.durLong, dockWindow.morphCurve);
dockJelly.kickAfter(-0.1, Math.round(Theme.durLong * 0.85));
}
@@ -382,9 +382,9 @@ PanelWindow {
}
// the card changing kind while the dock is it, volume to caps lock say
onOsdWidthChanged: if (dockWindow.osdShaped && !dockWindow.menuOpen)
onOsdWidthChanged: if (dockWindow.osdShaped && !dockWindow.menuInDock)
dockWindow.morphOsd(Theme.durMedium, Theme.easeEmphasizedDecel)
onOsdHeightChanged: if (dockWindow.osdShaped && !dockWindow.menuOpen)
onOsdHeightChanged: if (dockWindow.osdShaped && !dockWindow.menuInDock)
dockWindow.morphOsd(Theme.durMedium, Theme.easeEmphasizedDecel)
Timer {
@@ -417,6 +417,33 @@ PanelWindow {
property bool snapPlacement: false
property int contentFadeDelay: 0
property bool menuOpen: false
// a bar's Start module linked to the Apps module (shell.qml hands it over) takes
// the launcher in the dock's stead, unless the dock's own button asked for it
property var barLauncher: null
property bool openedFromDock: false
// where it is this time. both from the same inputs, so they never disagree
readonly property bool menuInDock: dockWindow.menuOpen && (dockWindow.openedFromDock || !dockWindow.barLauncher)
readonly property var launcherHost: dockWindow.menuOpen && !dockWindow.openedFromDock ? dockWindow.barLauncher : null
// the module the face is lent to, from when it hosts until its panel has shut again
property var faceLent: null
onLauncherHostChanged: {
if (dockWindow.launcherHost)
dockWindow.faceLent = dockWindow.launcherHost;
}
// a Start module that stops hosting while open (unlinked, say) shuts it
onBarLauncherChanged: {
if (dockWindow.menuOpen && !dockWindow.openedFromDock)
dockWindow.menuOpen = false;
}
function returnFace(host) {
if (dockWindow.faceLent === host && dockWindow.launcherHost !== host)
dockWindow.faceLent = null;
}
// the launcher face is ~64mb of delegates and nothing shows it until the
// menu opens, so it is built on the first open and then kept
property bool launcherBuilt: false
@@ -437,34 +464,14 @@ PanelWindow {
onMenuOpenChanged: {
if (dockWindow.menuOpen)
dockWindow.launcherBuilt = true;
dockWindow.pulseMorph();
// the launcher's momentum carries it past and back; a dock on screen squashes
// as it lands, one tucked away has nowhere to land
if (dockWindow.menuOpen)
dockJelly.kickAfter(Math.min(0.045, Theme.dp(26) / Math.max(1, dockWindow.menuHeight)), Math.round(Theme.ms(480) * 0.68));
else if (!dockWindow.launcherFromHidden)
dockJelly.kickAfter(-0.12, Math.round(Theme.ms(480) * 0.85));
dockWindow.contentFadeDelay = dockWindow.menuOpen ? 190 : 0;
else
dockWindow.openedFromDock = false;
powerDisarm.stop();
dockWindow.armedPower = "";
// window titles only reach lastIpcObject on a refresh, and search reads them
if (dockWindow.menuOpen)
toplevelRefresh.restart();
if (dockWindow.menuOpen) {
// no dock on screen means it was opened from elsewhere, so it notches.
// one only stepping down for the osd's notch is on its way back up
dockWindow.launcherFromHidden = !dockWindow.dockWanted;
dockWindow.closingFromHidden = false;
dockWindow.snapPlacement = true;
snapClear.restart();
} else if (dockWindow.launcherFromHidden) {
dockWindow.closingFromHidden = true;
hideAfterClose.restart();
} else {
dockWindow.launcherFromHidden = false;
}
if (dockWindow.menuOpen) {
// opened on the picker it was shut on: the mode stays the same, so
// onModeChanged never rescans, and the strip would be as it was left
@@ -480,6 +487,35 @@ PanelWindow {
}
}
// the dock grows into the launcher only while it is in the dock; lent to a bar
// module, the dock stays as it is
onMenuInDockChanged: {
if (dockWindow.menuInDock)
dockWindow.faceLent = null;
dockWindow.pulseMorph();
// the launcher's momentum carries it past and back; a dock on screen squashes
// as it lands, one tucked away has nowhere to land
if (dockWindow.menuInDock)
dockJelly.kickAfter(Math.min(0.045, Theme.dp(26) / Math.max(1, dockWindow.menuHeight)), Math.round(Theme.ms(480) * 0.68));
else if (!dockWindow.launcherFromHidden)
dockJelly.kickAfter(-0.12, Math.round(Theme.ms(480) * 0.85));
dockWindow.contentFadeDelay = dockWindow.menuInDock ? 190 : 0;
if (dockWindow.menuInDock) {
// no dock on screen means it was opened from elsewhere, so it notches.
// one only stepping down for the osd's notch is on its way back up
dockWindow.launcherFromHidden = !dockWindow.dockWanted;
dockWindow.closingFromHidden = false;
dockWindow.snapPlacement = true;
snapClear.restart();
} else if (dockWindow.launcherFromHidden) {
dockWindow.closingFromHidden = true;
hideAfterClose.restart();
} else {
dockWindow.launcherFromHidden = false;
}
}
// a wallpaper from outside the folder is listed only while it is on the
// desktop. once it is not, it goes while the picker is shut, so the next
// open never shows it, not even for a frame before the rescan lands
@@ -509,9 +545,9 @@ PanelWindow {
onTriggered: dockWindow.snapPlacement = false
}
onMenuWidthChanged: if (dockWindow.menuOpen)
onMenuWidthChanged: if (dockWindow.menuInDock)
dockWindow.pulseMorph()
onMenuHeightChanged: if (dockWindow.menuOpen)
onMenuHeightChanged: if (dockWindow.menuInDock)
dockWindow.pulseMorph()
Timer {
@@ -2070,7 +2106,7 @@ PanelWindow {
pinnedRow.bump(index);
}
readonly property bool pointerOnDock: shellHover.hovered && !dockWindow.menuOpen
readonly property bool pointerOnDock: shellHover.hovered && !dockWindow.menuInDock
readonly property int pinDropIndex: {
if (runningRow.pinDragCenter < 0)
@@ -2293,10 +2329,10 @@ PanelWindow {
onOnBarChanged: Qt.callLater(() => {
return dockWindow.exclusionTick++;
})
WlrLayershell.keyboardFocus: dockWindow.menuOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
WlrLayershell.keyboardFocus: dockWindow.menuInDock ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
// over a fullscreen window hyprland fades the top layer out, so a closing
// launcher keeps the overlay until it has shrunk and gone down
WlrLayershell.layer: (dockWindow.menuOpen || dockWindow.morphing) ? WlrLayer.Overlay : WlrLayer.Top
WlrLayershell.layer: (dockWindow.menuInDock || dockWindow.morphing) ? WlrLayer.Overlay : WlrLayer.Top
color: "transparent"
implicitWidth: Math.max(dockWindow.maxDockWidth, dockWindow.menuWidth)
implicitHeight: dockWindow.menuMaxHeight + dockWindow.dragHeadroom
@@ -2470,7 +2506,7 @@ PanelWindow {
id: launcherGrab
windows: [dockWindow].concat(Edit.active ? Edit.windows : [])
active: dockWindow.menuOpen && grabArm.armed
active: dockWindow.menuInDock && grabArm.armed
onCleared: {
if (grabArm.armed)
dockWindow.menuOpen = false;
@@ -2484,7 +2520,7 @@ PanelWindow {
property bool armed: false
interval: 250
running: dockWindow.menuOpen
running: dockWindow.menuInDock
onTriggered: grabArm.armed = true
onRunningChanged: {
if (!grabArm.running)
@@ -3125,14 +3161,14 @@ PanelWindow {
visible: dockWindow.shellShown
opacity: dockWindow.fadesOnBar && !dockWindow.dockRevealed ? 0 : 1
clip: dockWindow.menuOpen || dockWindow.morphing || dockWindow.osdMorphing
clip: dockWindow.menuInDock || dockWindow.morphing || dockWindow.osdMorphing
anchors.bottom: parent.bottom
anchors.bottomMargin: dockWindow.hiddenOffset + dockWindow.placementMargin
anchors.horizontalCenter: parent.horizontalCenter
implicitWidth: dockFace.implicitWidth
implicitHeight: dockWindow.iconSlot + Theme.dp(20)
width: dockWindow.menuOpen ? dockWindow.menuWidth : (dockWindow.osdShaped ? dockWindow.osdWidth : shell.implicitWidth)
height: dockWindow.menuOpen ? dockWindow.menuHeight : (dockWindow.osdShaped ? dockWindow.osdHeight : shell.implicitHeight)
width: dockWindow.menuInDock ? dockWindow.menuWidth : (dockWindow.osdShaped ? dockWindow.osdWidth : shell.implicitWidth)
height: dockWindow.menuInDock ? dockWindow.menuHeight : (dockWindow.osdShaped ? dockWindow.osdHeight : shell.implicitHeight)
radius: Math.min(Theme.rad(Prefs.dockRadius), Math.round(Theme.pill(shell.height)))
// split, the islands below paint it
color: dockWindow.splitDrawn ? "transparent" : Theme.bg
@@ -3165,7 +3201,7 @@ PanelWindow {
}
TapHandler {
enabled: Edit.active && !dockWindow.menuOpen
enabled: Edit.active && !dockWindow.menuInDock
acceptedButtons: Qt.RightButton
onTapped: dockWindow.editDock()
}
@@ -3310,7 +3346,7 @@ PanelWindow {
DropArea {
anchors.fill: parent
keys: ["text/uri-list"]
enabled: !dockWindow.menuOpen && Prefs.dockOn
enabled: !dockWindow.menuInDock && Prefs.dockOn
onEntered: (drag) => {
if (dockWindow.localPaths(drag.urls).length === 0) {
@@ -3350,7 +3386,7 @@ PanelWindow {
// shell resized and looped
x: Math.min(0, (shell.width - shell.implicitWidth) / 2)
anchors.bottom: parent.bottom
opacity: (dockWindow.menuOpen || dockWindow.launcherFromHidden || dockWindow.osdShaped) ? 0 : 1
opacity: (dockWindow.menuInDock || dockWindow.launcherFromHidden || dockWindow.osdShaped) ? 0 : 1
visible: dockFace.opacity > 0
Behavior on opacity {
@@ -3383,18 +3419,24 @@ PanelWindow {
displayName: "Launcher"
isToggle: true
pointerInside: dockWindow.pointerOnDock
toggleActive: dockWindow.menuOpen
toggleActive: dockWindow.menuInDock
iconContent: Component {
UI.LauncherGrid {
anchors.fill: parent
lit: launcherItem.hovered || dockWindow.menuOpen
lit: launcherItem.hovered || dockWindow.menuInDock
}
}
onRequestToggle: {
// open in a bar's Start module, it comes down here instead
if (dockWindow.launcherHost) {
dockWindow.openedFromDock = true;
return ;
}
if (!dockWindow.menuOpen)
dockWindow.setSearchText("");
dockWindow.openedFromDock = !dockWindow.menuOpen;
dockWindow.aimLauncher();
dockWindow.menuOpen = !dockWindow.menuOpen;
}
@@ -3522,7 +3564,7 @@ PanelWindow {
width: dockWindow.menuWidth - dockWindow.panelPadding
height: dockWindow.menuHeight - dockWindow.panelPadding
anchors.centerIn: parent
opacity: dockWindow.menuOpen ? 1 : 0
opacity: dockWindow.menuInDock ? 1 : 0
visible: launcherLoader.opacity > 0
sourceComponent: LauncherFace {
@@ -3615,6 +3657,16 @@ PanelWindow {
}
// the face goes where the launcher is shown, and stays with a bar module until
// its panel has shut
Binding {
target: launcherLoader.item
property: "parent"
value: dockWindow.faceLent && dockWindow.faceLent.faceSlot ? dockWindow.faceLent.faceSlot : launcherLoader
when: launcherLoader.item !== null
restoreMode: Binding.RestoreNone
}
// edit mode: an outline along the dock's own edge, and a handle above it to carry it up or down
DockEditOutline {
dock: dockWindow
+1 -1
View File
@@ -10,7 +10,7 @@ Item {
property var dock: null
property Item shellItem: null
readonly property bool shown: Edit.active && Prefs.dockOn && !!handle.dock && !handle.dock.menuOpen && !handle.dock.morphing
readonly property bool shown: Edit.active && Prefs.dockOn && !!handle.dock && !handle.dock.menuInDock && !handle.dock.morphing
readonly property bool hot: hover.hovered || drag.active
// over the dock as painted, so it rides a wobble with the top edge
+1 -1
View File
@@ -35,7 +35,7 @@ Item {
anchors.fill: parent
z: 2
opacity: Edit.active && !!outline.dock && outline.dock.shellShown && !outline.dock.menuOpen && !outline.dock.morphing ? 1 : 0
opacity: Edit.active && !!outline.dock && outline.dock.shellShown && !outline.dock.menuInDock && !outline.dock.morphing ? 1 : 0
visible: outline.opacity > 0.01
Rectangle {
+23 -5
View File
@@ -1531,14 +1531,31 @@ ShellRoot {
return m !== workspacesMod && m.expanded === true;
})
readonly property bool launcherUp: bar.primary && Prefs.barHoldsBottom && dock.menuOpen
readonly property bool launcherUp: bar.primary && Prefs.barHoldsBottom && dock.menuInDock
onPanelExpandedChanged: {
if (bar.panelExpanded && bar.primary && Prefs.barHoldsBottom)
if (bar.panelExpanded && bar.primary && Prefs.barHoldsBottom && dock.menuInDock)
dock.menuOpen = false;
}
// linked to the Apps module, the Start module is where the launcher opens.
// the link as set, on the full bar too, which draws no joins
readonly property bool startHostsLauncher: Prefs.barJoined("start", "apps") && startMod.shown && appsMod.shown && bar.adjacent("start", "apps")
function adjacent(a, b) {
const p = bar.placeMap[a];
const q = bar.placeMap[b];
return !!p && !!q && p.zone === q.zone && Math.abs(p.at - q.at) === 1;
}
Binding {
target: dock
property: "barLauncher"
value: bar.startHostsLauncher ? startMod : null
when: bar.primary
}
// the overview and the dock menu shut each other
Connections {
function onExpandedChanged() {
@@ -1556,9 +1573,10 @@ ShellRoot {
return ;
workspacesMod.expanded = false;
if (bar.primary && Prefs.barHoldsBottom) {
// the launcher is a panel of the bar's own now, or stands where they open
if (bar.primary && (dock.launcherHost || Prefs.barHoldsBottom)) {
for (const m of bar.modules) {
if (m.expanded === true)
if (m.expanded === true && m !== dock.launcherHost)
m.expanded = false;
}
@@ -1911,7 +1929,7 @@ ShellRoot {
PanelWindow {
id: clickCatcher
visible: dock.menuOpen && Monitors.surfacesUp
visible: dock.menuInDock && Monitors.surfacesUp
color: "transparent"
exclusiveZone: 0
WlrLayershell.layer: WlrLayer.Top