Compare commits

...

8 commits

11 changed files with 77 additions and 67 deletions

View file

@ -23,6 +23,7 @@ Column {
id: _artImgPrev id: _artImgPrev
anchors.fill: parent anchors.fill: parent
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
sourceSize: Qt.size(width, height)
asynchronous: true asynchronous: true
opacity: 0 opacity: 0
@ -41,6 +42,7 @@ Column {
id: _artImg id: _artImg
anchors.fill: parent anchors.fill: parent
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
sourceSize: Qt.size(width, height)
asynchronous: true asynchronous: true
opacity: 0 opacity: 0

View file

@ -1,5 +1,4 @@
import QtQuick import QtQuick
import Quickshell
import "../services" as S import "../services" as S
import "../modules" as M import "../modules" as M
@ -76,12 +75,14 @@ Column {
if (!map[key]) if (!map[key])
map[key] = { map[key] = {
appName: key, appName: key,
appIcon: n.appIcon, resolvedIcon: "",
notifs: [], notifs: [],
maxUrgency: 0, maxUrgency: 0,
maxTime: 0 maxTime: 0
}; };
map[key].notifs.push(n); map[key].notifs.push(n);
if (!map[key].resolvedIcon && n.resolvedIcon)
map[key].resolvedIcon = n.resolvedIcon;
if (n.urgency > map[key].maxUrgency) if (n.urgency > map[key].maxUrgency)
map[key].maxUrgency = n.urgency; map[key].maxUrgency = n.urgency;
if (n.time > map[key].maxTime) if (n.time > map[key].maxTime)
@ -101,7 +102,7 @@ Column {
arr.push({ arr.push({
type: "header", type: "header",
appName: g.appName, appName: g.appName,
appIcon: g.appIcon, resolvedIcon: g.resolvedIcon,
count: g.notifs.length, count: g.notifs.length,
collapsed: collapsed, collapsed: collapsed,
summaries: g.notifs.map(n => n.summary || "") summaries: g.notifs.map(n => n.summary || "")
@ -299,14 +300,7 @@ Column {
anchors.topMargin: (28 - height) / 2 anchors.topMargin: (28 - height) / 2
width: S.Theme.fontSize + 2 width: S.Theme.fontSize + 2
height: S.Theme.fontSize + 2 height: S.Theme.fontSize + 2
source: { source: notifDelegate._type === "header" ? (notifDelegate.modelData.resolvedIcon || "") : ""
if (notifDelegate._type !== "header")
return "";
const ic = notifDelegate.modelData.appIcon;
if (!ic)
return "";
return (ic.startsWith("/") || ic.startsWith("file://")) ? ic : Quickshell.iconPath(ic, "dialog-information");
}
visible: status === Image.Ready visible: status === Image.Ready
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
sourceSize: Qt.size(S.Theme.fontSize + 2, S.Theme.fontSize + 2) sourceSize: Qt.size(S.Theme.fontSize + 2, S.Theme.fontSize + 2)

View file

@ -16,7 +16,7 @@ PanelWindow {
property bool _winVisible: false property bool _winVisible: false
WlrLayershell.layer: S.DockState.mode === "pinned" ? WlrLayer.Top : WlrLayer.Overlay WlrLayershell.layer: S.DockState.mode === "pinned" ? WlrLayer.Bottom : WlrLayer.Overlay
WlrLayershell.exclusiveZone: S.DockState.mode === "pinned" ? _dockWidth : 0 WlrLayershell.exclusiveZone: S.DockState.mode === "pinned" ? _dockWidth : 0
WlrLayershell.namespace: "nova-dock" WlrLayershell.namespace: "nova-dock"
@ -136,10 +136,55 @@ PanelWindow {
} }
} }
// Dock bar - mirrors main bar style, hosts dock toggle when pinned
Item {
id: _dockBar
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
height: S.Theme.barHeight
visible: S.DockState.mode === "pinned"
transform: Translate {
x: root._slideX
}
Rectangle {
anchors.fill: parent
color: S.Theme.base00
}
// Bottom border - gradient matching bar style (base0C to base09, but just the right end)
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: S.Theme.base09
}
// Dock toggle
M.BarGroup {
anchors.centerIn: parent
M.BarModule {
tooltip: "Unpin dock"
onTapped: S.DockState.toggle()
M.BarIcon {
icon: "\uDB80\uDD8B"
anchors.verticalCenter: parent.verticalCenter
}
}
}
}
// Content - inset past the edge line + gap // Content - inset past the edge line + gap
Flickable { Flickable {
id: _flickable id: _flickable
anchors.fill: parent anchors.top: _dockBar.visible ? _dockBar.bottom : parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: S.Theme.groupSpacing + 1 anchors.leftMargin: S.Theme.groupSpacing + 1
contentHeight: _column.height contentHeight: _column.height
clip: true clip: true

View file

@ -1,5 +1,4 @@
import QtQuick import QtQuick
import Quickshell
import "../services" as S import "../services" as S
Row { Row {
@ -12,13 +11,15 @@ Row {
const notifs = S.NotifService.list.filter(n => n.state !== "dismissed"); const notifs = S.NotifService.list.filter(n => n.state !== "dismissed");
const groups = {}; const groups = {};
for (const n of notifs) { for (const n of notifs) {
const key = n.appIcon || n.appName || "unknown"; const key = n.appName || "unknown";
if (!groups[key]) if (!groups[key])
groups[key] = { groups[key] = {
icon: n.appIcon, resolvedIcon: "",
name: n.appName, name: n.appName,
count: 0 count: 0
}; };
if (!groups[key].resolvedIcon && n.resolvedIcon)
groups[key].resolvedIcon = n.resolvedIcon;
groups[key].count++; groups[key].count++;
} }
return Object.values(groups); return Object.values(groups);
@ -62,14 +63,7 @@ Row {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 14 width: 14
height: 14 height: 14
source: { source: _pill.modelData.resolvedIcon || ""
const icon = _pill.modelData.icon;
if (!icon)
return "";
if (icon.startsWith("/"))
return icon;
return Quickshell.iconPath(icon) ?? "";
}
sourceSize: Qt.size(14, 14) sourceSize: Qt.size(14, 14)
visible: source !== "" visible: source !== ""
} }

View file

@ -4,7 +4,7 @@ import "../services" as S
M.BarModule { M.BarModule {
id: root id: root
active: S.Modules.dock.enable active: S.Modules.dock.enable && S.DockState.mode !== "pinned"
tooltip: S.DockState.open ? "Close dock" : "Open dock" tooltip: S.DockState.open ? "Close dock" : "Open dock"
onTapped: S.DockState.toggle() onTapped: S.DockState.toggle()

View file

@ -1,5 +1,4 @@
import QtQuick import QtQuick
import Quickshell
import Quickshell.Services.Notifications import Quickshell.Services.Notifications
import "." as M import "." as M
import "../services" as S import "../services" as S
@ -87,15 +86,7 @@ Item {
anchors.topMargin: 8 anchors.topMargin: 8
width: root.iconSize width: root.iconSize
height: root.iconSize height: root.iconSize
source: { source: root.notif?.resolvedIcon ?? ""
const img = root.notif?.image;
if (img)
return img;
const ic = root.notif?.appIcon;
if (!ic)
return "";
return (ic.startsWith("/") || ic.startsWith("file://")) ? ic : Quickshell.iconPath(ic, "dialog-information");
}
visible: status === Image.Ready visible: status === Image.Ready
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
sourceSize: Qt.size(root.iconSize, root.iconSize) sourceSize: Qt.size(root.iconSize, root.iconSize)

View file

@ -7,6 +7,7 @@ Image {
required property color tint required property color tint
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
sourceSize: Qt.size(width, height)
layer.enabled: true layer.enabled: true
layer.effect: MultiEffect { layer.effect: MultiEffect {

View file

@ -6,7 +6,9 @@ import "../services" as S
M.HoverPanel { M.HoverPanel {
id: menuWindow id: menuWindow
showPanel: true // Deferred: anchorItem must be set before _show() computes position.
// Static `showPanel: true` would race with anchorItem initialization.
Component.onCompleted: showPanel = true
required property var handle required property var handle

View file

@ -1,8 +1,6 @@
pragma Singleton pragma Singleton
import QtQuick import QtQuick
import Quickshell
import Quickshell.Io
import Quickshell.Services.UPower import Quickshell.Services.UPower
import "." as S import "." as S
@ -47,34 +45,6 @@ QtObject {
} }
} }
// Low battery notifications
property bool _warnSent: false
property bool _critSent: false
property var _chargingWatcher: Connections {
target: root
function onChargingChanged() {
root._warnSent = false;
root._critSent = false;
}
function onPercentChanged() {
if (root.charging)
return;
if (root.percent < root.critThresh && !root._critSent) {
root._critSent = true;
root._warnSent = true;
_notifProc.command = ["notify-send", "--urgency=critical", "--icon=battery-low", "--category=device", "Very Low Battery", "Connect to power now!"];
_notifProc.running = true;
} else if (root.percent < root.warnThresh && !root._warnSent) {
root._warnSent = true;
_notifProc.command = ["notify-send", "--icon=battery-caution", "--category=device", "Low Battery"];
_notifProc.running = true;
}
}
}
property var _notifProc: Process {}
function fmtTime(secs) { function fmtTime(secs) {
if (!secs || secs <= 0) if (!secs || secs <= 0)
return ""; return "";

View file

@ -1,4 +1,5 @@
import QtQuick import QtQuick
import Quickshell
import Quickshell.Services.Notifications import Quickshell.Services.Notifications
import "." as S import "." as S
@ -20,6 +21,17 @@ QtObject {
property var actions: [] property var actions: []
property real time: Date.now() property real time: Date.now()
// Resolved icon URL - checks image first, then resolves appIcon via XDG lookup
readonly property string resolvedIcon: {
if (image)
return image;
if (!appIcon)
return "";
if (appIcon.startsWith("/") || appIcon.startsWith("file://"))
return appIcon;
return Quickshell.iconPath(appIcon, "dialog-information");
}
// Expire timer owned by this item, not dynamically created // Expire timer owned by this item, not dynamically created
readonly property Timer _expireTimer: Timer { readonly property Timer _expireTimer: Timer {
running: false running: false

View file

@ -84,7 +84,6 @@ shell/modules/WeatherModule.qml: Unqualified access [unqualified]
shell/modules/WindowTitleModule.qml: Unqualified access [unqualified] shell/modules/WindowTitleModule.qml: Unqualified access [unqualified]
shell/modules/WorkspacesModule.qml: Member "screen" not found on type "QObject" [missing-property] shell/modules/WorkspacesModule.qml: Member "screen" not found on type "QObject" [missing-property]
shell/modules/WorkspacesModule.qml: Unqualified access [unqualified] shell/modules/WorkspacesModule.qml: Unqualified access [unqualified]
shell/services/BatteryService.qml: Unqualified access [unqualified]
shell/services/BluetoothService.qml: Unqualified access [unqualified] shell/services/BluetoothService.qml: Unqualified access [unqualified]
shell/services/LockService.qml: Type QProcess::ExitStatus of parameter exitStatus in signal called exited was not found, but is required to compile onExited. Did you add all imports and dependencies? [signal-handler-parameters] shell/services/LockService.qml: Type QProcess::ExitStatus of parameter exitStatus in signal called exited was not found, but is required to compile onExited. Did you add all imports and dependencies? [signal-handler-parameters]
shell/services/LockService.qml: Unqualified access [unqualified] shell/services/LockService.qml: Unqualified access [unqualified]