zach/z-bar-qt
1
1
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

rebase to feat/video-wallpapers

Browse Source
This commit is contained in:
zach
2026-10-29 17:46:27 +01:00
parent ed7e977eb5
commit 858e4e5b12
13 changed files with 116 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Components/Clock.qml
+3 -1
View File
@@ -46,7 +46,9 @@ WidgetBase {
}
required property SnapLayout loader
required property Wrapper popouts
readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
readonly property int roundedWidth: Math.round(timeText.implicitWidth)
readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
readonly property real size: horizontal ? evenWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
required property ScreenState screenState
implicitHeight: horizontal ? baseSize : size
Modules/Bar/Components/Common/BatteryIcon.qml
+1 -1
View File
@@ -24,7 +24,7 @@ Row {
color: Battery.getColors(root.percentage, root.devState).bg
height: root.batHeight
radius: root.radius
width: root.batWidth
width: root.batWidth - 1
CustomText {
color: Battery.getColors(root.percentage, root.devState).fg
Modules/Bar/Components/MediaWidget.qml
-2
View File
@@ -77,8 +77,6 @@ WidgetBase {
anchors.fill: parent
hoverEnabled: true
onClicked: console.log(root.mapToGlobal(0, 0), layout.implicitWidth)
onContainsMouseChanged: {
if (!containsMouse) {
mediatext.marqueeEnabled = false;
Modules/Bar/Components/Resources.qml
+1 -2
View File
@@ -24,8 +24,7 @@ WidgetBase {
StateLayer {
color: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
// onClicked: root.screenState.resources = !root.screenState.resources
onClicked: console.log(root.mapToGlobal(0, 0))
onClicked: root.screenState.resources = !root.screenState.resources
}
GridLayout {
Modules/Bar/Components/StatusIcons.qml
+3 -3
View File
@@ -32,7 +32,7 @@ WidgetBase {
return -1;
}
readonly property real size: horizontal ? grid.implicitWidth + grid.anchors.leftMargin + grid.anchors.rightMargin : grid.implicitHeight + grid.anchors.bottomMargin + grid.anchors.topMargin
readonly property int spacing: Tokens.spacing.medium / 2
readonly property int spacing: Tokens.spacing.extraSmall
// Entries that can shrink to nothing, spacing included
function collapsed(entry: var): bool {
@@ -134,8 +134,8 @@ WidgetBase {
Layout.rightMargin: root.horizontal ? Math.round(rightGap) : 0
Layout.topMargin: root.horizontal ? 0 : Math.round(leftGap)
children: item
implicitHeight: item?.implicitHeight ?? 0
implicitWidth: item?.implicitWidth ?? 0
implicitHeight: item?.height ?? item?.implicitHeight ?? 0
implicitWidth: item?.width ?? item?.implicitWidth ?? 0
Behavior on leftGap {
Anim {
Modules/Bar/Components/StatusIcons/AudioWidget.qml
+3 -1
View File
@@ -7,7 +7,7 @@ import qs.Components
import qs.Services
MaterialIcon {
id: speaker
id: root
required property bool horizontal
@@ -16,6 +16,8 @@ MaterialIcon {
fill: 1
fontStyle: Tokens.font.icon.small
text: Audio.muted ? "volume_off" : "volume_up"
width: Math.round(implicitWidth)
height: Math.round(implicitHeight)
Behavior on Layout.maximumWidth {
Anim {}
Modules/Bar/Components/StatusIcons/MicWidget.qml
+3 -1
View File
@@ -7,7 +7,7 @@ import qs.Components
import qs.Services
MaterialIcon {
id: mic
id: root
required property bool horizontal
@@ -16,6 +16,8 @@ MaterialIcon {
fill: 1
fontStyle: Tokens.font.icon.small
text: Audio.sourceMuted ? "mic_off" : "mic"
width: Math.round(implicitWidth)
height: Math.round(implicitHeight)
Behavior on Layout.maximumWidth {
Anim {}
Modules/Lock/Content.qml
+3 -17
View File
@@ -53,24 +53,10 @@ Item {
lock: root.lock
}
SnapLayout {
NotifDock {
Layout.fillHeight: true
Layout.fillWidth: true
spacing: Tokens.spacing.medium
orientation: Qt.Vertical
CustomRect {
Layout.fillHeight: true
Layout.fillWidth: true
bottomRightRadius: Tokens.rounding.largeIncreased
color: Colors.tPalette.m3surfaceContainer
radius: Tokens.rounding.small
topRightRadius: Tokens.rounding.largeIncreased
NotifDock {
lock: root.lock
}
}
lock: root.lock
}
}
}
Modules/Lock/LockSurface.qml
+1 -1
View File
@@ -221,9 +221,9 @@ WlSessionLockSurface {
anchors.fill: parent
color: Colors.palette.m3surface
layer.enabled: true
opacity: Colors.transparency.enabled ? Colors.transparency.base : 1
radius: lockContent.radius
layer.enabled: true
layer.effect: MultiEffect {
blurMax: 15
Modules/Lock/NotifDock.qml
+95 -91
View File
@@ -12,114 +12,118 @@ import qs.Helpers
import qs.Daemons
import qs.Services
SnapLayout {
CustomRect {
id: root
required property var lock
anchors.fill: parent
anchors.margins: Tokens.padding.large
bottomRightRadius: Tokens.rounding.largeIncreased
color: Colors.tPalette.m3surfaceContainer
radius: Tokens.rounding.small
topRightRadius: Tokens.rounding.largeIncreased
orientation: Qt.Vertical
spacing: Tokens.spacing.small
SnapLayout {
anchors.fill: parent
anchors.margins: Tokens.padding.large
CustomText {
Layout.fillWidth: true
color: Colors.palette.m3outline
elide: Text.ElideRight
font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
}
orientation: Qt.Vertical
spacing: Tokens.spacing.small
Item {
id: clipRect
Layout.fillHeight: true
Layout.fillWidth: true
Loader {
active: opacity > 0
anchors.centerIn: parent
opacity: NotifServer.list.length > 0 ? 0 : 1
Behavior on opacity {
Anim {
duration: Tokens.anim.durations.extraLarge
}
}
sourceComponent: SnapLayout {
spacing: Tokens.spacing.largeIncreased
orientation: Qt.Vertical
CustomText {
Layout.alignment: Qt.AlignHCenter
color: Colors.palette.m3outlineVariant
font: Tokens.font.headline.builders.small.width(90).build()
text: qsTr("No Notifications")
}
}
CustomText {
Layout.fillWidth: true
color: Colors.palette.m3outline
elide: Text.ElideRight
font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
}
CustomListView {
anchors.fill: parent
clip: true
spacing: Tokens.spacing.small
Item {
Layout.fillHeight: true
Layout.fillWidth: true
add: Transition {
Anim {
from: 0
property: "opacity"
to: 1
Loader {
active: opacity > 0
anchors.centerIn: parent
opacity: NotifServer.list.length > 0 ? 0 : 1
Behavior on opacity {
Anim {
duration: Tokens.anim.durations.extraLarge
}
}
sourceComponent: ColumnLayout {
spacing: Tokens.spacing.largeIncreased
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
from: 0
property: "scale"
to: 1
CustomText {
Layout.alignment: Qt.AlignHCenter
color: Colors.palette.m3outlineVariant
font: Tokens.font.headline.builders.small.width(90).build()
text: qsTr("No Notifications")
}
}
}
delegate: NotifGroup {}
displaced: Transition {
Anim {
properties: "opacity,scale"
to: 1
}
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
property: "y"
}
}
model: ScriptModel {
values: {
const list = NotifServer.notClosed.map(n => [n.appName, null]);
return [...new Map(list).keys()];
}
}
move: Transition {
Anim {
properties: "opacity,scale"
to: 1
}
CustomListView {
anchors.fill: parent
clip: true
spacing: Tokens.spacing.small
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
property: "y"
}
}
remove: Transition {
Anim {
property: "opacity"
to: 0
}
add: Transition {
Anim {
from: 0
property: "opacity"
to: 1
}
Anim {
property: "scale"
to: 0.6
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
from: 0
property: "scale"
to: 1
}
}
delegate: NotifGroup {}
displaced: Transition {
Anim {
properties: "opacity,scale"
to: 1
}
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
property: "y"
}
}
model: ScriptModel {
values: {
const list = NotifServer.notClosed.map(n => [n.appName, null]);
return [...new Map(list).keys()];
}
}
move: Transition {
Anim {
properties: "opacity,scale"
to: 1
}
Anim {
duration: Tokens.anim.durations.expressiveDefaultSpatial
easing: Tokens.anim.expressiveDefaultSpatial
property: "y"
}
}
remove: Transition {
Anim {
property: "opacity"
to: 0
}
Anim {
property: "scale"
to: 0.6
}
}
}
}
Modules/Lock/WeatherInfo.qml
+2 -2
View File
@@ -19,6 +19,7 @@ CustomRect {
return base + brief.anchors.topMargin;
}
radius: Tokens.rounding.small
topLeftRadius: Tokens.rounding.largeIncreased
Timer {
interval: 900000 // 15 minutes
@@ -48,7 +49,6 @@ CustomRect {
anchors.right: parent.right
asynchronous: true
sourceComponent: Forecast {
}
sourceComponent: Forecast {}
}
}
Modules/Sidebar/Chat/Content/ChatHost.qml
-1
View File
@@ -59,7 +59,6 @@ Item {
id: container
anchors.fill: parent
layer.enabled: opacity < 1
objectName: "ConversationContainer"
Component.onCompleted: {