auroraa8f0e9d
aurora: dock the bar at the top again (same nothing style, no floating pill)
+13 −14
3 files changed
- M .config/quickshell/aurora/Bar.qml +10 −10
- M .config/quickshell/aurora/Settings.qml +1 −1
- M .config/quickshell/aurora/Theme.qml +2 −3
| @@ -6,7 +6,7 @@ import Quickshell.Hyprland | |||
| 6 | 6 | import Quickshell.Services.Pipewire | |
| 7 | 7 | import Quickshell.Services.UPower | |
| 8 | 8 | ||
| 9 | − | // The bar: a floating pill at the top of every monitor. | |
| 9 | + | // The bar: a strip docked at the top of every monitor. | |
| 10 | 10 | // Left: the mark (a dotted ring: click = runner; its centre turns the live colour while something records or listens, | |
| 11 | 11 | // the ring lights up in a wave on a new notification), this monitor's workspaces as dots, the cat. | |
| 12 | 12 | // Centre: the active window (focused monitor only). Right: tray, recording, privacy, caffeine/airplane, headset, | |
| @@ -20,9 +20,8 @@ PanelWindow { | |||
| 20 | 20 | signal toggleOverlay(string name, var scr) | |
| 21 | 21 | ||
| 22 | 22 | anchors { top: true; left: true; right: true } | |
| 23 | − | implicitHeight: Theme.barHeight // the pill + the gap above it; also the exclusive zone | |
| 23 | + | implicitHeight: Theme.barHeight | |
| 24 | 24 | color: "transparent" | |
| 25 | − | mask: Region { item: pill } | |
| 26 | 25 | WlrLayershell.namespace: "aurora-bar" | |
| 27 | 26 | ||
| 28 | 27 | SystemClock { id: clock; precision: SystemClock.Minutes } | |
| @@ -79,14 +78,15 @@ PanelWindow { | |||
| 79 | 78 | ||
| 80 | 79 | Rectangle { | |
| 81 | 80 | id: pill | |
| 82 | − | x: Theme.barGap | |
| 83 | − | y: Theme.barGap | |
| 84 | − | width: parent.width - 2 * Theme.barGap | |
| 85 | − | height: Theme.barSize | |
| 86 | − | radius: height / 2 | |
| 81 | + | anchors.fill: parent | |
| 87 | 82 | color: Qt.rgba(Theme.s1.r, Theme.s1.g, Theme.s1.b, Theme.barAlpha) | |
| 88 | − | border.width: 1 | |
| 89 | − | border.color: Theme.s2 | |
| 83 | + | Rectangle { // hairline along the bottom | |
| 84 | + | anchors.left: parent.left | |
| 85 | + | anchors.right: parent.right | |
| 86 | + | anchors.bottom: parent.bottom | |
| 87 | + | height: 1 | |
| 88 | + | color: Theme.s2 | |
| 89 | + | } | |
| 90 | 90 | ||
| 91 | 91 | // ---------------- left ---------------- | |
| 92 | 92 | Row { | |
| @@ -121,7 +121,7 @@ Singleton { | |||
| 121 | 121 | property bool motion: true // shell animations (Theme.t) | |
| 122 | 122 | property bool clock24: true | |
| 123 | 123 | property string appIcons: "dots" // dots | mono | colour: how app icons are drawn | |
| 124 | − | property int barSize: 40 // height of the bar pill (Doto clock from 40 up) | |
| 124 | + | property int barSize: 40 // height of the bar (Doto clock from 40 up) | |
| 125 | 125 | property string wallLook: "dots" // dots | colour | photo: how aurora draws the wallpaper (WallView) | |
| 126 | 126 | property int wallPitch: 10 // dot step, px | |
| 127 | 127 | property int wallBright: 85 // %, from the background to the full image | |
| @@ -19,9 +19,8 @@ Singleton { | |||
| 19 | 19 | readonly property int fontSize: Settings.fontSize | |
| 20 | 20 | readonly property int wsFontSize: Settings.wsFontSize // workspace icons only; everything else uses fontSize | |
| 21 | 21 | readonly property real panelAlpha: Settings.panelAlpha | |
| 22 | − | readonly property int barSize: Math.max(32, Settings.barSize) // the bar pill | |
| 23 | − | readonly property int barGap: 6 // pill to the screen edge | |
| 24 | − | readonly property int barHeight: barSize + barGap // what the bar reserves at the top | |
| 22 | + | readonly property int barSize: Math.max(32, Settings.barSize) // the bar's height (docked at the top) | |
| 23 | + | readonly property int barHeight: barSize // what the bar reserves at the top | |
| 25 | 24 | readonly property real barAlpha: Settings.barAlpha | |
| 26 | 25 | ||
| 27 | 26 | // ---- motion: ease-out-quart without overshoot (glyph's "glide"); Settings.motion off = instant ---- | |