From 7c0f5533e182a28fcfb208d17ff573e5b1c21f4f Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 13 Aug 2025 23:03:23 +1000 Subject: internal: use icon os logo instead of nerd font Add caelestia logo to use as fallback os logo Add recolour lock fetch logo option --- modules/dashboard/dash/User.qml | 42 ++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'modules/dashboard') diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 2b475dd..e45153e 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -1,9 +1,11 @@ import qs.components +import qs.components.effects import qs.components.images import qs.services import qs.config import qs.utils import Quickshell +import Quickshell.Widgets import QtQuick Row { @@ -111,11 +113,39 @@ Row { anchors.verticalCenter: parent.verticalCenter spacing: Appearance.spacing.normal - InfoLine { - icon: SysInfo.osIcon - text: SysInfo.osPrettyName || SysInfo.osName - colour: Colours.palette.m3primary - materialIcon: false + Item { + id: line + + implicitWidth: icon.implicitWidth + text.width + text.anchors.leftMargin + implicitHeight: Math.max(icon.implicitHeight, text.implicitHeight) + + IconImage { + id: icon + + anchors.left: parent.left + anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2 + + source: SysInfo.osLogo + implicitSize: Math.floor(Appearance.font.size.normal * 1.34) + + layer.enabled: true + layer.effect: Colouriser { + colorizationColor: Colours.palette.m3primary + } + } + + StyledText { + id: text + + anchors.verticalCenter: icon.verticalCenter + anchors.left: icon.right + anchors.leftMargin: icon.anchors.leftMargin + text: `: ${SysInfo.osPrettyName || SysInfo.osName}` + font.pointSize: Appearance.font.size.normal + + width: Config.dashboard.sizes.infoWidth + elide: Text.ElideRight + } } InfoLine { @@ -139,7 +169,6 @@ Row { required property string icon required property string text required property color colour - property bool materialIcon: true implicitWidth: icon.implicitWidth + text.width + text.anchors.leftMargin implicitHeight: Math.max(icon.implicitHeight, text.implicitHeight) @@ -154,7 +183,6 @@ Row { text: line.icon color: line.colour font.pointSize: Appearance.font.size.normal - font.family: line.materialIcon ? Appearance.font.family.material : Appearance.font.family.sans } StyledText { -- cgit v1.2.3-freya