Gabriel Brown
2528edfddc
The control center fix applies to five more surfaces: the date menu, the clipboard panel, the activity panel, notification toasts, and the signal glass all opened 48 pixels under the bar while their own expression asked for 12. wlr-layer-shell has three behaviors and only the middle one is subtle. A positive exclusiveZone reserves space; a negative one ignores what others reserved; zero reserves nothing but RESPECTS what others reserved. Every popover here uses zero, so the compositor had already placed them below the bar before their own margin applied, and adding Theme.barHeight counted the bar twice. It is not a crash or a warning -- the surface simply opens lower than written -- so a contract now holds the rule mechanically: a surface with exclusiveZone 0 may not name Theme.barHeight in a margin. It also checks the premise it rests on, and fails if the bar ever stops reserving its own height rather than quietly checking the wrong thing. Measured after: date menu and clipboard at 12px, control center at 2px, each matching what its code asks for. Claude-Session: https://claude.ai/code/session_01BRvzt4H8XXLPVH5MyYdk9L
103 lines
3.3 KiB
QML
103 lines
3.3 KiB
QML
// The one Signal Glass layer surface. Transient curated events briefly take
|
|
// precedence; when they expire, an explicitly revealed focus session returns.
|
|
|
|
import Quickshell
|
|
import Quickshell.Hyprland
|
|
import Quickshell.Wayland
|
|
import QtQuick
|
|
import qs.config
|
|
import qs.services
|
|
|
|
PanelWindow {
|
|
id: root
|
|
|
|
property var modelData: null
|
|
readonly property var event: StatusEvents.activeEvent
|
|
readonly property string eventMonitor: root.event?.monitorName ?? Hyprland.focusedMonitor?.name ?? ""
|
|
readonly property bool eventBelongsHere: StatusEvents.active && (!root.eventMonitor || !root.modelData || root.modelData.name === root.eventMonitor)
|
|
readonly property bool focusBelongsHere: FocusSession.active && FocusSession.capsuleVisible
|
|
&& (!FocusSession.monitorName || !root.modelData || root.modelData.name === FocusSession.monitorName)
|
|
readonly property bool showingEvent: root.eventBelongsHere
|
|
readonly property bool requestedVisible: root.showingEvent || root.focusBelongsHere
|
|
|
|
screen: root.modelData
|
|
anchors.top: true
|
|
// The gap ALONE, not the bar height plus the gap. exclusiveZone 0 means
|
|
// "reserve nothing, but respect what others reserved", so this surface
|
|
// already begins below the bar's zone -- adding the bar height here counted
|
|
// it twice and left the surface floating 48px under the bar instead of 12.
|
|
margins.top: Theme.barGap * 2
|
|
exclusiveZone: 0
|
|
implicitWidth: root.showingEvent ? 388 : 438
|
|
implicitHeight: root.showingEvent ? 76 : 132
|
|
color: "transparent"
|
|
|
|
WlrLayershell.namespace: "qs-signal-glass"
|
|
WlrLayershell.layer: WlrLayer.Overlay
|
|
WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
|
|
|
|
property bool mapped: false
|
|
visible: root.mapped
|
|
|
|
onRequestedVisibleChanged: {
|
|
if (root.requestedVisible) {
|
|
unmapTimer.stop();
|
|
root.mapped = true;
|
|
entrance.restart();
|
|
} else if (root.mapped) {
|
|
unmapTimer.restart();
|
|
}
|
|
}
|
|
|
|
onShowingEventChanged: {
|
|
if (root.requestedVisible)
|
|
entrance.restart();
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
if (root.requestedVisible)
|
|
root.mapped = true;
|
|
}
|
|
|
|
Timer {
|
|
id: unmapTimer
|
|
interval: Theme.durNormal
|
|
onTriggered: root.mapped = false
|
|
}
|
|
|
|
Loader {
|
|
id: content
|
|
anchors.fill: parent
|
|
sourceComponent: root.showingEvent ? eventComponent : focusComponent
|
|
opacity: root.requestedVisible ? 1 : 0
|
|
|
|
Behavior on opacity {
|
|
NumberAnimation { duration: Theme.durNormal; easing.type: Easing.OutCubic }
|
|
}
|
|
|
|
transform: Translate {
|
|
id: slide
|
|
y: root.requestedVisible ? 0 : -6
|
|
Behavior on y {
|
|
NumberAnimation { duration: Theme.durNormal; easing.type: Easing.OutCubic }
|
|
}
|
|
}
|
|
}
|
|
|
|
Component {
|
|
id: eventComponent
|
|
EventCard { event: root.event }
|
|
}
|
|
|
|
Component {
|
|
id: focusComponent
|
|
FocusCard {}
|
|
}
|
|
|
|
ParallelAnimation {
|
|
id: entrance
|
|
NumberAnimation { target: content; property: "opacity"; from: 0; to: 1; duration: Theme.durNormal; easing.type: Easing.OutCubic }
|
|
NumberAnimation { target: slide; property: "y"; from: -6; to: 0; duration: Theme.durNormal; easing.type: Easing.OutCubic }
|
|
}
|
|
}
|