zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-05-31 01:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock Screen also uses this clock

Browse Source
This commit is contained in:
Corey Woodworth
2025-10-29 21:51:45 -04:00
parent 04d89905cf
commit b3cddc1ede
4 changed files with 56 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/LockScreen/LockScreen.qml
+38 -70
View File
@@ -12,6 +12,7 @@ import qs.Commons
import qs.Services
import qs.Widgets
import qs.Modules.Audio
import qs.Modules.Bar.Calendar
Loader {
id: lockScreen
@@ -363,81 +364,48 @@ Loader {
Layout.fillWidth: true
}
Item {
// Clock
ClockLoader {
// The 'now' property is available as Time.date
now: Time.date
// Apply layout properties from the old Item
Layout.preferredWidth: 70
Layout.preferredHeight: 70
Layout.alignment: Qt.AlignVCenter
// Seconds circular progress
Canvas {
id: secondsProgress
anchors.fill: parent
property real progress: Time.date.getSeconds() / 60
onProgressChanged: requestPaint()
Connections {
target: Time
function onDateChanged() {
const total = Time.date.getSeconds() * 1000 + Time.date.getMilliseconds()
secondsProgress.progress = total / 60000
}
}
onPaint: {
var ctx = getContext("2d")
var centerX = width / 2
var centerY = height / 2
var radius = Math.min(width, height) / 2 - 3
ctx.reset()
// Background circle
ctx.beginPath()
ctx.arc(centerX, centerY, radius, 0, 2 * Math.PI)
ctx.lineWidth = 2.5
ctx.strokeStyle = Qt.alpha(Color.mOnSurface, 0.15)
ctx.stroke()
// Progress arc
ctx.beginPath()
ctx.arc(centerX, centerY, radius, -Math.PI / 2, -Math.PI / 2 + progress * 2 * Math.PI)
ctx.lineWidth = 2.5
ctx.strokeStyle = Color.mPrimary
ctx.lineCap = "round"
ctx.stroke()
}
}
// Digital clock
ColumnLayout {
anchors.centerIn: parent
spacing: 0
NText {
text: {
var t = Settings.data.location.use12hourFormat ? Qt.locale().toString(Time.date, "hh AP") : Qt.locale().toString(Time.date, "HH")
return t
}
pointSize: Style.fontSizeM
font.weight: Style.fontWeightBold
family: Settings.data.ui.fontFixed
color: Color.mOnSurface
horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignHCenter
}
NText {
text: Qt.formatTime(Time.date, "mm")
pointSize: Style.fontSizeM
font.weight: Style.fontWeightBold
family: Settings.data.ui.fontFixed
color: Color.mOnSurfaceVariant
horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignHCenter
}
}
// *** Override the colors to match the LockScreen style ***
backgroundColor: Color.mSurface
clockColor: Color.mOnSurface
}
// ColumnLayout {
// anchors.centerIn: parent
// spacing: 0
//
// NText {
// text: {
// var t = Settings.data.location.use12hourFormat ? Qt.locale().toString(Time.date, "hh AP") : Qt.locale().toString(Time.date, "HH")
// return t
// }
// pointSize: Style.fontSizeM
// font.weight: Style.fontWeightBold
// family: Settings.data.ui.fontFixed
// color: Color.mOnSurface
// horizontalAlignment: Text.AlignHCenter
// Layout.alignment: Qt.AlignHCenter
// }
//
// NText {
// text: Qt.formatTime(Time.date, "mm")
// pointSize: Style.fontSizeM
// font.weight: Style.fontWeightBold
// family: Settings.data.ui.fontFixed
// color: Color.mOnSurfaceVariant
// horizontalAlignment: Text.AlignHCenter
// Layout.alignment: Qt.AlignHCenter
// }
// }
}
}