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

intermediary changes, plan to revert to mousearea for gestures + config load bugfixes
C++ / fmt (pull_request) Failing after 6s
Details
C++ / build (pull_request) Failing after 9s
Details
C++ / clang-tidy (pull_request) Failing after 9s
Details
JS/TS / fmt (pull_request) Successful in 13s
Details
JS/TS / lint (pull_request) Successful in 8s
Details
Python / static (pull_request) Successful in 41s
Details
Rust / build (pull_request) Successful in 51s
Details
Python / verify (pull_request) Successful in 1m45s
Details
Rust / fmt (pull_request) Successful in 33s
Details
Rust / clippy (pull_request) Successful in 52s
Details

Browse Source
This commit is contained in:
zach
2026-09-22 02:35:18 +02:00
parent 25bee293b0
commit a1d96b60f6
15 changed files with 461 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Components/Clock.qml
+1 -11
View File
@@ -14,7 +14,7 @@ WidgetBase {
id: root
readonly property font font: Tokens.font.clock.family(Config.appearance.font.family.clock).build()
readonly property color contentColor: screenState.dashboard ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
readonly property color contentColor: Colors.palette.m3onSurface
readonly property string effectiveFormat: {
let fmt = Config.general.dateFormat;
if (!root.horizontal)
@@ -48,7 +48,6 @@ WidgetBase {
readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
required property ScreenState screenState
color: screenState.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
implicitHeight: horizontal ? baseSize : size
implicitWidth: horizontal ? size : baseSize
radius: Tokens.rounding.full
@@ -142,13 +141,4 @@ WidgetBase {
}
}
}
StateLayer {
acceptedButtons: Qt.LeftButton
color: root.contentColor
onClicked: {
root.screenState.dashboard = !root.screenState.dashboard;
}
}
}
Modules/Dashboard/Media/LyricList.qml
+1 -1
View File
@@ -179,7 +179,7 @@ Item {
CustomText {
text: qsTr("Loading lyrics...")
color: Colors.palette.m3onSurfaceVariant
font: Tokens.font.body.normal
font: Tokens.font.body.medium
}
}
Modules/Launcher/Items/FilesItem.qml
+3 -3
View File
@@ -76,7 +76,7 @@ Item {
id: icon
anchors.verticalCenter: parent.verticalCenter
implicitSize: Tokens.font.size.extraLarge
implicitSize: Tokens.font.icon.extraLarge.pointSize
source: Quickshell.iconPath(root.modelData?.icon) ?? ""
visible: !root.modelData?.isImage
}
@@ -94,14 +94,14 @@ Item {
}
sourceComponent: LoadingIndicator {
color: Colors.palette.m3primaryContainer
implicitSize: Tokens.font.size.extraLarge
implicitSize: Tokens.font.icon.extraLarge.pointSize
}
}
FadeImage {
id: image
property int implicitSize: Tokens.font.size.extraLarge
property int implicitSize: Tokens.font.icon.extraLarge.pointSize
width: implicitSize
fillMode: Image.PreserveAspectFit
Modules/Lock/InputField.qml
+1 -1
View File
@@ -70,7 +70,7 @@ Item {
anchors.centerIn: parent
anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0
implicitHeight: Tokens.font.size.normal
implicitHeight: Tokens.font.body.medium.pointSize
implicitWidth: fullWidth
interactive: false
orientation: Qt.Horizontal
Modules/Notifications/Sidebar/Chat/Content/ChatHost.qml
+108 -108
View File
@@ -6,138 +6,138 @@ import qs.Services
import qs.Modules.Notifications.Sidebar.Chat
Item {
id: root
id: root
property int animOff
property Item currentItem
property bool noAnim: false
property bool loading: false
property int lastIdx: -1
property int animOff
property Item currentItem
property bool noAnim: false
property bool loading: false
property int lastIdx: -1
readonly property Component conversationComp: ChatContent {}
readonly property Component conversationComp: ChatContent {}
signal requestClose
signal requestClose
function loadConversation(chat): void {
if (currentItem) {
currentItem.destroy();
currentItem = null;
}
function loadConversation(chat): void {
if (currentItem) {
currentItem.destroy();
currentItem = null;
}
if (!chat)
return;
if (!chat)
return;
root.loading = true;
root.loading = true;
const incubator = root.conversationComp.incubateObject(container, {
chatData: chat
});
const incubator = root.conversationComp.incubateObject(container, {
chatData: chat
});
const attach = () => {
incubator.object.anchors.fill = container;
incubator.object.requestClose.connect(root.requestClose);
currentItem = incubator.object;
root.loading = false;
if (!noAnim)
enterAnim.start();
};
const attach = () => {
incubator.object.anchors.fill = container;
incubator.object.requestClose.connect(root.requestClose);
currentItem = incubator.object;
root.loading = false;
if (!noAnim)
enterAnim.start();
};
if (incubator.status === Component.Ready)
attach();
else
incubator.onStatusChanged = status => {
if (status === Component.Ready)
attach();
};
}
if (incubator.status === Component.Ready)
attach();
else
incubator.onStatusChanged = status => {
if (status === Component.Ready)
attach();
};
}
Item {
id: container
Item {
id: container
anchors.fill: parent
layer.enabled: opacity < 1
objectName: "ConversationContainer"
anchors.fill: parent
layer.enabled: opacity < 1
objectName: "ConversationContainer"
Component.onCompleted: {
if (ChatState.chatSession)
root.loadConversation(ChatState.chatSession);
}
}
Component.onCompleted: {
if (ChatState.chatSession)
root.loadConversation(ChatState.chatSession);
}
}
LoadingIndicator {
anchors.centerIn: parent
implicitSize: Tokens.font.size.extraLarge * 4
opacity: root.loading ? 1 : 0
visible: opacity > 0
LoadingIndicator {
anchors.centerIn: parent
implicitSize: Tokens.font.icon.large.pointSize * 4
opacity: root.loading ? 1 : 0
visible: opacity > 0
Behavior on opacity {
Anim {}
}
}
Behavior on opacity {
Anim {}
}
}
Connections {
function onChatSessionChanged(): void {
exitAnim.complete();
enterAnim.complete();
Connections {
function onChatSessionChanged(): void {
exitAnim.complete();
enterAnim.complete();
if (root.noAnim) {
root.loadConversation(ChatState.chatSession);
return;
}
if (root.noAnim) {
root.loadConversation(ChatState.chatSession);
return;
}
root.animOff = Tokens.padding.small * (ChatState.currentIdx > root.lastIdx ? 1 : -1);
root.lastIdx = ChatState.currentIdx;
exitAnim.start();
}
root.animOff = Tokens.padding.small * (ChatState.currentIdx > root.lastIdx ? 1 : -1);
root.lastIdx = ChatState.currentIdx;
exitAnim.start();
}
target: ChatState
}
target: ChatState
}
SequentialAnimation {
id: exitAnim
SequentialAnimation {
id: exitAnim
Anim {
property: "opacity"
target: container
to: 0
type: Anim.DefaultEffects
}
Anim {
property: "opacity"
target: container
to: 0
type: Anim.DefaultEffects
}
ScriptAction {
script: root.loadConversation(ChatState.chatSession)
}
}
ScriptAction {
script: root.loadConversation(ChatState.chatSession)
}
}
SequentialAnimation {
id: enterAnim
SequentialAnimation {
id: enterAnim
PropertyAction {
property: "topMargin"
target: container.anchors
value: root.animOff
}
PropertyAction {
property: "topMargin"
target: container.anchors
value: root.animOff
}
PropertyAction {
property: "bottomMargin"
target: container.anchors
value: -root.animOff
}
PropertyAction {
property: "bottomMargin"
target: container.anchors
value: -root.animOff
}
ParallelAnimation {
Anim {
from: 0
property: "opacity"
target: container
to: 1
type: Anim.SlowEffects
}
ParallelAnimation {
Anim {
from: 0
property: "opacity"
target: container
to: 1
type: Anim.SlowEffects
}
Anim {
properties: "topMargin,bottomMargin"
target: container.anchors
to: 0
type: Anim.SlowEffects
}
}
}
Anim {
properties: "topMargin,bottomMargin"
target: container.anchors
to: 0
type: Anim.SlowEffects
}
}
}
}
Modules/Notifications/Sidebar/Chat/Content/MathBlockView.qml
+1 -1
View File
@@ -9,7 +9,7 @@ Item {
required property string latex
property color mathColor: Colors.palette.m3onSurface
property real fontSize: Tokens.font.size.large
property real fontSize: Tokens.font.body.large.pointSize
implicitHeight: Math.max(equationImage.height, fallbackText.contentHeight) + Tokens.padding.small * 2
Modules/Notifications/Sidebar/Chat/SidebarView.qml
+1 -1
View File
@@ -16,7 +16,7 @@ Item {
property int breakpoint: Math.round(Config.sidebar.sizes.width * 2) + Tokens.spacing.medium * 2 + Tokens.padding.medium * 3
property color blobColor: Colors.tPalette.m3surfaceContainerLow
readonly property int iconSize: Math.round(Tokens.font.size.extraLarge * (96 / 72)) + Tokens.padding.large * 2
readonly property int iconSize: Math.round(Tokens.font.icon.extraLarge.pointSize * (96 / 72)) + Tokens.padding.large * 2
property alias conversationModel: sidebar.model
property bool chatOpen: ChatState.chatSession !== null
Modules/Notifications/Sidebar/Utils/Cards/RecordingList.qml
+1 -1
View File
@@ -56,7 +56,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.rightMargin: -Tokens.spacing.small
clip: true
implicitHeight: (Tokens.font.size.larger + Tokens.padding.extraSmall) * (root.screenState.recordingListExpanded ? 10 : 3)
implicitHeight: (Tokens.font.body.large.pointSize + Tokens.padding.extraSmall) * (root.screenState.recordingListExpanded ? 10 : 3)
CustomScrollBar.vertical: CustomScrollBar {
flickable: list
Modules/Settings/Pages/Apps/AllApps.qml
+1 -1
View File
@@ -56,7 +56,7 @@ PageBase {
IconImage {
asynchronous: true
implicitSize: Math.round(Tokens.font.size.large * 1.8)
implicitSize: Math.round(Tokens.font.icon.large * 1.8)
source: Quickshell.iconPath(appItem.modelData.icon, "image-missing")
}
Modules/Settings/Pages/Apps/AppInfo.qml
+1 -1
View File
@@ -47,7 +47,7 @@ PageBase {
IconImage {
asynchronous: true
implicitSize: Math.round(Tokens.font.size.large * 3)
implicitSize: Math.round(Tokens.font.icon.large.pointSize * 3)
source: Quickshell.iconPath(root.app?.icon, "image-missing")
}
Modules/Settings/Pages/AppsPage.qml
+1 -1
View File
@@ -143,7 +143,7 @@ PageBase {
IconImage {
asynchronous: true
implicitSize: Math.round(Tokens.font.size.large * 1.8)
implicitSize: Math.round(Tokens.font.icon.large.pointSize * 1.8)
source: Quickshell.iconPath(appItem.modelData.icon, "image-missing")
}