Compare commits

...

4 commits

7 changed files with 295 additions and 300 deletions

View file

@ -205,7 +205,7 @@ M.BarSection {
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: "\uF185" text: "\uF185"
color: M.Theme.base0A color: root.accentColor
font.pixelSize: M.Theme.fontSize + 2 font.pixelSize: M.Theme.fontSize + 2
font.family: M.Theme.iconFontFamily font.family: M.Theme.iconFontFamily
} }
@ -228,7 +228,7 @@ M.BarSection {
Rectangle { Rectangle {
width: parent.width * root.percent / 100 width: parent.width * root.percent / 100
height: parent.height height: parent.height
color: M.Theme.base0A color: root.accentColor
radius: 3 radius: 3
Behavior on width { Behavior on width {

View file

@ -107,8 +107,10 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: M.Theme.groupSpacing spacing: M.Theme.groupSpacing
M.Privacy {}
M.BarGroup { M.BarGroup {
M.Privacy {
visible: M.Modules.privacy.enable
}
M.Clock { M.Clock {
visible: M.Modules.clock.enable visible: M.Modules.clock.enable
} }

View file

@ -79,6 +79,12 @@ QtObject {
warning: 25, warning: 25,
critical: 15 critical: 15
}) })
property var privacy: ({
enable: true
})
property var screenCorners: ({
enable: true
})
property var power: ({ property var power: ({
enable: true enable: true
}) })

View file

@ -252,7 +252,7 @@ M.BarSection {
width: (parent.width - 15 * parent.spacing) / 16 width: (parent.width - 15 * parent.spacing) / 16
height: parent.height * (root._cavaBars[index] ?? 0) height: parent.height * (root._cavaBars[index] ?? 0)
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: M.Theme.base0E color: root.accentColor
radius: 1 radius: 1
Behavior on height { Behavior on height {
@ -382,7 +382,7 @@ M.BarSection {
Rectangle { Rectangle {
width: parent.width * Math.min(1, Math.max(0, parent.parent.frac)) width: parent.width * Math.min(1, Math.max(0, parent.parent.frac))
height: parent.height height: parent.height
color: M.Theme.base0E color: root.accentColor
radius: 2 radius: 2
} }
} }
@ -413,7 +413,7 @@ M.BarSection {
Text { Text {
text: root.playing ? "\uF04C" : "\uF04B" text: root.playing ? "\uF04C" : "\uF04B"
color: M.Theme.base0E color: root.accentColor
font.pixelSize: M.Theme.fontSize + 8 font.pixelSize: M.Theme.fontSize + 8
font.family: M.Theme.iconFontFamily font.family: M.Theme.iconFontFamily
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -459,7 +459,7 @@ M.BarSection {
height: 18 height: 18
radius: 9 radius: 9
color: _active ? M.Theme.base02 : (pArea.containsMouse ? M.Theme.base02 : "transparent") color: _active ? M.Theme.base02 : (pArea.containsMouse ? M.Theme.base02 : "transparent")
border.color: _active ? M.Theme.base0E : M.Theme.base03 border.color: _active ? root.accentColor : M.Theme.base03
border.width: _active ? 1 : 0 border.width: _active ? 1 : 0
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -467,7 +467,7 @@ M.BarSection {
id: _pLabel id: _pLabel
anchors.centerIn: parent anchors.centerIn: parent
text: modelData.identity ?? "Player" text: modelData.identity ?? "Player"
color: _active ? M.Theme.base0E : M.Theme.base04 color: _active ? root.accentColor : M.Theme.base04
font.pixelSize: M.Theme.fontSize - 2 font.pixelSize: M.Theme.fontSize - 2
font.family: M.Theme.fontFamily font.family: M.Theme.fontFamily
font.bold: _active font.bold: _active

View file

@ -64,24 +64,32 @@ M.PopupPanel {
} }
} }
property var _delegates: []
property var _pendingDismissIds: [] property var _pendingDismissIds: []
function _cascadeDismiss() { function _cascadeDismiss() {
const dels = _delegates.filter(d => d && d.modelData && !d.modelData.closed); const list = M.NotifService.list;
if (dels.length === 0) if (list.length === 0)
return; return;
_pendingDismissIds = dels.map(d => d.modelData.id); _pendingDismissIds = list.map(n => n.id);
for (let i = 0; i < dels.length; i++) { const visibles = [];
const d = dels[i]; for (let i = 0; i < list.length; i++) {
const isLast = (i === dels.length - 1); const d = notifList.itemAtIndex(i);
if (d && d.modelData?.state !== "dismissing")
visibles.push(d);
}
if (visibles.length === 0) {
_finishCascade();
return;
}
for (let i = 0; i < visibles.length; i++) {
_cascadeTimer.createObject(menuWindow, { _cascadeTimer.createObject(menuWindow, {
_target: d, _target: visibles[i],
_delay: i * 60, _delay: i * 60,
_isLast: isLast _isLast: i === visibles.length - 1
}); });
} }
} }
@ -132,25 +140,12 @@ M.PopupPanel {
} }
// Notification list (scrollable) // Notification list (scrollable)
Item { ListView {
id: notifList
width: menuWindow.panelWidth width: menuWindow.panelWidth
height: Math.min(notifFlick.contentHeight, _maxHeight) height: Math.min(contentHeight, 60 * (M.Modules.notifications.maxVisible || 10))
readonly property real _itemHeight: 60
readonly property real _maxHeight: _itemHeight * (M.Modules.notifications.maxVisible || 10)
Flickable {
id: notifFlick
anchors.fill: parent
contentWidth: width
contentHeight: notifCol.implicitHeight
clip: true clip: true
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
Column {
id: notifCol
width: parent.width
Repeater {
model: M.NotifService.list model: M.NotifService.list
delegate: Item { delegate: Item {
@ -182,15 +177,7 @@ M.PopupPanel {
_dismissAnim.start(); _dismissAnim.start();
} }
Component.onCompleted: { Component.onCompleted: fadeIn.start()
menuWindow._delegates.push(notifItem);
fadeIn.start();
}
Component.onDestruction: {
const idx = menuWindow._delegates.indexOf(notifItem);
if (idx >= 0)
menuWindow._delegates.splice(idx, 1);
}
NumberAnimation { NumberAnimation {
id: fadeIn id: fadeIn
@ -419,10 +406,7 @@ M.PopupPanel {
onClicked: _dismissAnim.start() onClicked: _dismissAnim.start()
} }
} }
} // Repeater }
} // Column
} // Flickable
} // Item
// Empty state // Empty state
Text { Text {

View file

@ -365,7 +365,7 @@ M.BarSection {
anchors.rightMargin: 12 anchors.rightMargin: 12
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: modelData.description || modelData.name || "Unknown" text: modelData.description || modelData.name || "Unknown"
color: parent._active ? M.Theme.base0E : M.Theme.base05 color: parent._active ? root.accentColor : M.Theme.base05
font.pixelSize: M.Theme.fontSize font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily font.family: M.Theme.fontFamily
font.bold: parent._active font.bold: parent._active
@ -472,7 +472,7 @@ M.BarSection {
Rectangle { Rectangle {
width: parent.width * Math.min(1, Math.max(0, streamEntry._vol)) width: parent.width * Math.min(1, Math.max(0, streamEntry._vol))
height: parent.height height: parent.height
color: streamEntry._muted ? M.Theme.base04 : M.Theme.base0E color: streamEntry._muted ? M.Theme.base04 : root.accentColor
radius: 2 radius: 2
} }

View file

@ -40,9 +40,12 @@ ShellRoot {
} }
} }
LazyLoader {
active: Modules.screenCorners.enable
ScreenCorners { ScreenCorners {
screen: scope.modelData screen: scope.modelData
} }
} }
} }
}
} }