diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml index d525bfec..a2ef18f7 100644 --- a/Modules/Bar/Widgets/CustomButton.qml +++ b/Modules/Bar/Widgets/CustomButton.qml @@ -250,15 +250,10 @@ Item { const htmlRegex = /<\/?[a-zA-Z][\s\S]*>/; if (htmlRegex.test(str)) { - return str; + return str; } - const escaped = str - .replace(/&/g, "&") - .replace(//g, ">") - .replace(/"/g, """) - .replace(/'/g, "'"); + const escaped = str.replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); const withBreaks = escaped.replace(/\r\n|\r|\n/g, "
"); diff --git a/Modules/Bar/Widgets/NotificationHistory.qml b/Modules/Bar/Widgets/NotificationHistory.qml index 7c4d7173..44137df2 100644 --- a/Modules/Bar/Widgets/NotificationHistory.qml +++ b/Modules/Bar/Widgets/NotificationHistory.qml @@ -123,7 +123,7 @@ NIconButton { radius: height / 2 color: Color.mError border.color: Color.mSurface - border.width: 1 + border.width: Style.borderS visible: count > 0 || !hideWhenZero } } diff --git a/Modules/Bar/Widgets/TaskbarGrouped.qml b/Modules/Bar/Widgets/TaskbarGrouped.qml index cf132dc2..a933cd80 100644 --- a/Modules/Bar/Widgets/TaskbarGrouped.qml +++ b/Modules/Bar/Widgets/TaskbarGrouped.qml @@ -260,7 +260,7 @@ Item { radius: Style.radiusS border.color: workspaceModel.isFocused ? Color.mPrimary : Color.mOutline - border.width: 1 + border.width: Style.borderS width: (hasWindows ? iconsFlow.implicitWidth : root.itemSize * 0.8) + (root.isVerticalBar ? Style.marginXS : Style.marginL) height: (hasWindows ? iconsFlow.implicitHeight : root.itemSize * 0.8) + (root.isVerticalBar ? Style.marginL : Style.marginXS) color: Style.capsuleColor diff --git a/Modules/Panels/Settings/Tabs/WallpaperTab.qml b/Modules/Panels/Settings/Tabs/WallpaperTab.qml index 2013d752..138334f2 100644 --- a/Modules/Panels/Settings/Tabs/WallpaperTab.qml +++ b/Modules/Panels/Settings/Tabs/WallpaperTab.qml @@ -405,7 +405,7 @@ ColumnLayout { color: selected ? Color.mPrimary : Color.mSurfaceVariant implicitHeight: Math.max(Style.baseWidgetSize * 0.55, 24) implicitWidth: chipLabel.implicitWidth + Style.marginM * 1.5 - border.width: 1 + border.width: Style.borderS border.color: selected ? Color.transparent : Color.mOutline MouseArea { diff --git a/Modules/Panels/SetupWizard/SetupAppearanceStep.qml b/Modules/Panels/SetupWizard/SetupAppearanceStep.qml index 21e64f4c..38810462 100644 --- a/Modules/Panels/SetupWizard/SetupAppearanceStep.qml +++ b/Modules/Panels/SetupWizard/SetupAppearanceStep.qml @@ -301,7 +301,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: 48 radius: Style.radiusM - border.width: 1 + border.width: Style.borderS property bool isActive: Settings.data.colorSchemes.matugenSchemeType === modelData.key diff --git a/Modules/Panels/SetupWizard/SetupCustomizeStep.qml b/Modules/Panels/SetupWizard/SetupCustomizeStep.qml index e14f860d..f3447eb8 100644 --- a/Modules/Panels/SetupWizard/SetupCustomizeStep.qml +++ b/Modules/Panels/SetupWizard/SetupCustomizeStep.qml @@ -141,7 +141,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: 40 radius: Style.radiusM - border.width: 1 + border.width: Style.borderS property bool isActive: selectedBarPosition === modelData.key @@ -258,7 +258,7 @@ ColumnLayout { ] delegate: Rectangle { radius: 16 - border.width: 1 + border.width: Style.borderS Layout.preferredHeight: 32 Layout.preferredWidth: Math.max(90, densityText.implicitWidth + Style.marginXL * 2) diff --git a/Modules/Panels/SetupWizard/SetupWizard.qml b/Modules/Panels/SetupWizard/SetupWizard.qml index a914fd96..67b13e3d 100644 --- a/Modules/Panels/SetupWizard/SetupWizard.qml +++ b/Modules/Panels/SetupWizard/SetupWizard.qml @@ -95,7 +95,7 @@ SmartPanel { color: Color.mSurfaceVariant radius: width / 2 border.color: Color.mOutline - border.width: 2 + border.width: Style.borderM visible: parent.status === Image.Error NIcon { diff --git a/Services/Compositor/CompositorService.qml b/Services/Compositor/CompositorService.qml index 539c5079..3a4a8957 100644 --- a/Services/Compositor/CompositorService.qml +++ b/Services/Compositor/CompositorService.qml @@ -229,7 +229,7 @@ Singleton { displayScales = scales; saveDisplayScalesToCache(); displayScalesChanged(); - Logger.i("CompositorService", "Display scales updated"); + Logger.d("CompositorService", "Display scales updated"); } // Save display scales to cache diff --git a/Services/System/HostService.qml b/Services/System/HostService.qml index 84946055..9afea2f1 100644 --- a/Services/System/HostService.qml +++ b/Services/System/HostService.qml @@ -105,7 +105,7 @@ Singleton { return l ? l.split("=")[1].replace(/"/g, "") : ""; }; root.osPretty = val("PRETTY_NAME") || val("NAME"); - Logger.i("HostService", root.osPretty); + Logger.i("HostService", "Detected", root.osPretty); const osId = (val("ID") || "").toLowerCase(); root.isNixOS = osId === "nixos" || (root.osPretty || "").toLowerCase().includes("nixos"); @@ -126,10 +126,10 @@ Singleton { const p = String(stdout.text || "").trim(); if (code === 0 && p) { root.osLogo = `file://${p}`; - Logger.i("HostService", "found", root.osLogo); + Logger.d("HostService", "Found", root.osLogo); } else { root.osLogo = ""; - Logger.w("HostService", "none found"); + Logger.w("HostService", "None logo found"); } } stdout: StdioCollector {} diff --git a/Widgets/NSpinBox.qml b/Widgets/NSpinBox.qml index a25b8596..44fc550b 100644 --- a/Widgets/NSpinBox.qml +++ b/Widgets/NSpinBox.qml @@ -88,7 +88,7 @@ RowLayout { radius: height * 0.5 color: Color.mSurfaceVariant border.color: (root.hovering || decreaseArea.containsMouse || increaseArea.containsMouse) ? Color.mHover : Color.mOutline - border.width: 1 + border.width: Style.borderS Behavior on border.color { ColorAnimation { diff --git a/Widgets/NTextInput.qml b/Widgets/NTextInput.qml index 8694768f..42014872 100644 --- a/Widgets/NTextInput.qml +++ b/Widgets/NTextInput.qml @@ -200,7 +200,6 @@ ColumnLayout { tooltipText: I18n.tr("widgets.text-input.clear") Layout.alignment: Qt.AlignVCenter - border.width: 0 colorBg: Color.transparent