lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1709 from notiant/patch-17

Browse Source 
Fixing desktop clock widget colorization
This commit is contained in:
Lysec
2026-02-06 16:03:28 +01:00
committed by GitHub
parent 3a6217628c 8fbfc07890
commit 395ba7fec1
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/SystemMonitor.qml
+1 -1
View File
@@ -83,7 +83,7 @@ Item {
let rows = [];
// CPU
rows.push([I18n.tr("system-monitor.cpu-usage"), `${Math.round(SystemStatService.cpuUsage)}% (${SystemStatService.cpuFreq})`]);
rows.push([I18n.tr("system-monitor.cpu-usage"), `${Math.round(SystemStatService.cpuUsage)}% (${SystemStatService.cpuFreq.replace(/[^0-9.]/g, "")} GHz)`]);
if (SystemStatService.cpuTemp > 0) {
rows.push([I18n.tr("system-monitor.cpu-temp"), `${Math.round(SystemStatService.cpuTemp)}°C`]);
Modules/DesktopWidgets/Widgets/DesktopClock.qml
+3 -13
View File
@@ -12,21 +12,11 @@ DraggableDesktopWidget {
readonly property var now: Time.now
readonly property var widgetMetadata: DesktopWidgetRegistry.widgetMetadata["Clock"]
readonly property color clockTextColor: {
if (usePrimaryColor) {
return Color.mPrimary;
}
var txtColor = widgetData && widgetData.textColor ? widgetData.textColor : "";
return (txtColor && txtColor !== "") ? txtColor : Color.mOnSurface;
}
readonly property real fontSize: {
var size = widgetData && widgetData.fontSize ? widgetData.fontSize : 0;
var baseSize = (size && size > 0) ? size : Style.fontSizeXXXL * 2.5;
return Math.round(baseSize * widgetScale);
}
readonly property color clockTextColor: Color.resolveColorKey(clockColor)
readonly property real fontSize: Math.round(Style.fontSizeXXXL * 2.5 * widgetScale)
readonly property real widgetOpacity: (widgetData && widgetData.opacity !== undefined) ? widgetData.opacity : 1.0
readonly property string clockStyle: (widgetData && widgetData.clockStyle !== undefined) ? widgetData.clockStyle : (widgetMetadata.clockStyle !== undefined ? widgetMetadata.clockStyle : "digital")
readonly property bool usePrimaryColor: (widgetData && widgetData.usePrimaryColor !== undefined) ? widgetData.usePrimaryColor : (widgetMetadata.usePrimaryColor !== undefined ? widgetMetadata.usePrimaryColor : false)
readonly property string clockColor: (widgetData && widgetData.clockColor !== undefined) ? widgetData.clockColor : (widgetMetadata.clockColor !== undefined ? widgetMetadata.clockColor : "none")
readonly property bool useCustomFont: (widgetData && widgetData.useCustomFont !== undefined) ? widgetData.useCustomFont : (widgetMetadata.useCustomFont !== undefined ? widgetMetadata.useCustomFont : false)
readonly property string customFont: (widgetData && widgetData.customFont !== undefined) ? widgetData.customFont : ""
readonly property string format: (widgetData && widgetData.format !== undefined) ? widgetData.format : (widgetMetadata.format !== undefined ? widgetMetadata.format : "HH:mm\\nd MMMM yyyy")
Modules/Panels/Settings/DesktopWidgets/WidgetSettings/ClockSettings.qml
+2 -2
View File
@@ -18,7 +18,7 @@ ColumnLayout {
property bool valueShowBackground: widgetData.showBackground !== undefined ? widgetData.showBackground : widgetMetadata.showBackground
property bool valueRoundedCorners: widgetData.roundedCorners !== undefined ? widgetData.roundedCorners : true
property string valueClockStyle: widgetData.clockStyle !== undefined ? widgetData.clockStyle : widgetMetadata.clockStyle
property bool valueClockColor: widgetData.clockColor !== undefined ? widgetData.clockColor : widgetMetadata.clockColor
property string valueClockColor: widgetData.clockColor !== undefined ? widgetData.clockColor : widgetMetadata.clockColor
property bool valueUseCustomFont: widgetData.useCustomFont !== undefined ? widgetData.useCustomFont : widgetMetadata.useCustomFont
property string valueCustomFont: widgetData.customFont !== undefined ? widgetData.customFont : ""
property string valueFormat: widgetData.format !== undefined ? widgetData.format : widgetMetadata.format
@@ -101,7 +101,7 @@ ColumnLayout {
NComboBox {
label: I18n.tr("common.select-color")
description: I18n.tr("bar.clock.select-color-description")
description: I18n.tr("common.select-color-description")
model: [
{
"name": I18n.tr("common.none"),
Modules/Panels/SystemStats/SystemStatsPanel.qml
+1 -1
View File
@@ -90,7 +90,7 @@ SmartPanel {
}
NText {
text: `${Math.round(SystemStatService.cpuUsage)}% ${SystemStatService.cpuFreq}`
text: `${Math.round(SystemStatService.cpuUsage)}% ${SystemStatService.cpuFreq.replace(/[^0-9.]/g, "")} GHz`
pointSize: Style.fontSizeXS
color: Color.mPrimary
font.family: Settings.data.ui.fontFixed