mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
anthonyhab
f34dcc11b9
Change bar margin settings from percentage values (0-1) to integer pixel values (0-18). Add migration 38 to convert existing settings. Update all margin calculations to use pixel values directly. Update UI labels to show "px" instead of "%".
63 lines
2.2 KiB
QML
63 lines
2.2 KiB
QML
import QtQuick
|
|
import Quickshell
|
|
import Quickshell.Wayland
|
|
import qs.Commons
|
|
import qs.Services.Compositor
|
|
|
|
/**
|
|
* BarExclusionZone - Invisible PanelWindow that reserves exclusive space for the bar
|
|
*
|
|
* This is a minimal window that works with the compositor to reserve space,
|
|
* while the actual bar UI is rendered in MainScreen.
|
|
*/
|
|
PanelWindow {
|
|
id: root
|
|
|
|
readonly property bool exclusive: Settings.data.bar.exclusive
|
|
readonly property string barPosition: Settings.data.bar.position || "top"
|
|
readonly property bool barIsVertical: barPosition === "left" || barPosition === "right"
|
|
readonly property bool barFloating: Settings.data.bar.floating || false
|
|
readonly property real barMarginH: barFloating ? Math.ceil(Settings.data.bar.marginHorizontal) : 0
|
|
readonly property real barMarginV: barFloating ? Math.ceil(Settings.data.bar.marginVertical) : 0
|
|
readonly property real fractOffset: CompositorService.getDisplayScale(screen?.name) % 1.0
|
|
|
|
// Invisible - just reserves space
|
|
color: "transparent"
|
|
|
|
mask: Region {}
|
|
|
|
// Wayland layer shell configuration
|
|
WlrLayershell.layer: WlrLayer.Top
|
|
WlrLayershell.namespace: "noctalia-bar-exclusion-" + (screen?.name || "unknown")
|
|
WlrLayershell.exclusionMode: exclusive ? ExclusionMode.Auto : ExclusionMode.Ignore
|
|
|
|
// Anchor based on bar position
|
|
anchors {
|
|
top: barPosition === "top"
|
|
bottom: barPosition === "bottom"
|
|
left: barPosition === "left" || barPosition === "top" || barPosition === "bottom"
|
|
right: barPosition === "right" || barPosition === "top" || barPosition === "bottom"
|
|
}
|
|
|
|
// Size based on bar orientation
|
|
implicitWidth: {
|
|
if (barIsVertical) {
|
|
// Vertical bar: reserve bar height + margin on the anchored edge only
|
|
return Style.barHeight + barMarginH - fractOffset;
|
|
}
|
|
return 0; // Auto-width when left/right anchors are true
|
|
}
|
|
|
|
implicitHeight: {
|
|
if (!barIsVertical) {
|
|
// Horizontal bar: reserve bar height + margin on the anchored edge only
|
|
return Style.barHeight + barMarginV - fractOffset;
|
|
}
|
|
return 0; // Auto-height when top/bottom anchors are true
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
Logger.d("BarExclusionZone", "Created for screen:", screen?.name);
|
|
}
|
|
}
|