From 1bb7afe7b02dbf6114687d7fede00fb980a5f5be Mon Sep 17 00:00:00 2001 From: Robin Seger Date: Mon, 9 Mar 2026 14:27:43 +0100 Subject: feat: add Logo shape component (#1247) * Logo Shape component - Added Logo.qml component with scaling - Updated OsIcon to use Logo component * missed removing tour * [CI] chore: update flake * Colours.palette defaults * fixed import, added logo to Fetch.qml * single shape parent, prop changes * prop changes --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- modules/bar/components/OsIcon.qml | 30 ++++++++++++++++++++++++------ modules/lock/Fetch.qml | 31 ++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 15 deletions(-) (limited to 'modules') diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml index 2bc3864..a61500a 100644 --- a/modules/bar/components/OsIcon.qml +++ b/modules/bar/components/OsIcon.qml @@ -3,9 +3,13 @@ import qs.services import qs.config import qs.utils import QtQuick +import qs.components Item { id: root + + implicitWidth: Appearance.font.size.large * 1.2 + implicitHeight: Appearance.font.size.large * 1.2 MouseArea { anchors.fill: parent @@ -16,13 +20,27 @@ Item { } } - ColouredIcon { + Loader { anchors.centerIn: parent - source: SysInfo.osLogo - implicitSize: Appearance.font.size.large * 1.2 - colour: Colours.palette.m3tertiary + sourceComponent: SysInfo.isDefaultLogo ? caelestiaLogo : distroIcon } - implicitWidth: Appearance.font.size.large * 1.2 - implicitHeight: Appearance.font.size.large * 1.2 + Component { + id: caelestiaLogo + + Logo { + implicitWidth: Appearance.font.size.large * 1.8 + implicitHeight: Appearance.font.size.large * 1.8 + } + } + + Component { + id: distroIcon + + ColouredIcon { + source: SysInfo.osLogo + implicitSize: Appearance.font.size.large * 1.2 + colour: Colours.palette.m3tertiary + } + } } diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml index ded5608..55d6aa7 100644 --- a/modules/lock/Fetch.qml +++ b/modules/lock/Fetch.qml @@ -51,7 +51,7 @@ ColumnLayout { Layout.fillHeight: true active: !iconLoader.active - sourceComponent: OsLogo {} + sourceComponent: SysInfo.isDefaultLogo ? caelestiaLogo : distroIcon } } @@ -66,7 +66,7 @@ ColumnLayout { Layout.fillHeight: true active: root.width > 320 - sourceComponent: OsLogo {} + sourceComponent: SysInfo.isDefaultLogo ? caelestiaLogo : distroIcon } ColumnLayout { @@ -142,15 +142,28 @@ ColumnLayout { } } - component WrappedLoader: Loader { - visible: active + Component { + id: caelestiaLogo + + Logo { + width: height + height: height + } + } + + Component { + id: distroIcon + + ColouredIcon { + source: SysInfo.osLogo + implicitSize: height + colour: Colours.palette.m3primary + layer.enabled: Config.lock.recolourLogo + } } - component OsLogo: ColouredIcon { - source: SysInfo.osLogo - implicitSize: height - colour: Colours.palette.m3primary - layer.enabled: Config.lock.recolourLogo || SysInfo.isDefaultLogo + component WrappedLoader: Loader { + visible: active } component FetchText: MonoText { -- cgit v1.2.3-freya