diff --git a/Modules/AppLauncher/AppLauncher.qml b/Modules/AppLauncher/AppLauncher.qml index 9120e4d..2e3f870 100644 --- a/Modules/AppLauncher/AppLauncher.qml +++ b/Modules/AppLauncher/AppLauncher.qml @@ -369,9 +369,8 @@ NLoader { height: 56 * scaling radius: 16 * scaling property bool isSelected: index === selectedIndex - color: (appCardArea.containsMouse || isSelected) ? Qt.darker( - Colors.colorPrimary, - 1.1) : Colors.colorSurface + color: (appCardArea.containsMouse || isSelected) ? Qt.darker(Colors.colorPrimary, + 1.1) : Colors.colorSurface border.color: (appCardArea.containsMouse || isSelected) ? Colors.colorPrimary : "transparent" border.width: (appCardArea.containsMouse || isSelected) ? 2 : 0 diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index 07c7077..ea50bc2 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -631,7 +631,8 @@ WlSessionLock { width: 64 * Scaling.scale(screen) height: 64 * Scaling.scale(screen) radius: 32 - color: Qt.rgba(Colors.colorError.r, Colors.colorError.g, Colors.colorError.b, shutdownArea.containsMouse ? 0.9 : 0.2) + color: Qt.rgba(Colors.colorError.r, Colors.colorError.g, Colors.colorError.b, + shutdownArea.containsMouse ? 0.9 : 0.2) border.color: Colors.colorError border.width: 2 * Scaling.scale(screen) diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml index e2ae004..926a816 100644 --- a/Modules/Settings/SettingsPanel.qml +++ b/Modules/Settings/SettingsPanel.qml @@ -254,7 +254,6 @@ NLoader { "wght": (Font.Normal + Font.Bold) / 2.0 } font.pointSize: Style.fontSizeLarge * scaling - } // Tab label on the left side NText { diff --git a/Modules/SidePanel/Cards/WeatherCard.qml b/Modules/SidePanel/Cards/WeatherCard.qml index 3eab860..48eb790 100644 --- a/Modules/SidePanel/Cards/WeatherCard.qml +++ b/Modules/SidePanel/Cards/WeatherCard.qml @@ -112,7 +112,7 @@ NBox { return `${max}°/${min}°` } font.pointSize: Style.fontSizeSmall * scaling - color: Colors.colorOnSurfaceVariant + color: Colors.colorOnSurfaceVariant } } } diff --git a/Services/Colors.qml b/Services/Colors.qml index fa4230d..972f483 100644 --- a/Services/Colors.qml +++ b/Services/Colors.qml @@ -43,7 +43,6 @@ Singleton { property color colorOutlineVariant: useMatugen ? matugenTheme.colorOutlineVariant : defaultTheme.colorOutlineVariant property color colorShadow: useMatugen ? matugenTheme.colorShadow : defaultTheme.colorShadow - // ----------- // Check if we should use Matugen theme property bool useMatugen: Settings.data.wallpaper.generateTheme && matugenFile.loaded @@ -91,7 +90,6 @@ Singleton { property color colorOutlineVariant: "#000000" // A subtler outline color for decorative elements or dividers. property color colorShadow: "#000000" // The color used for shadows to create elevation. - // // property color colorBackground: "#191724" // // property color colorSurface: "#1f1d2e" // // property color colorSurfaceVariant: "#26233a" diff --git a/Services/Wallpapers.qml b/Services/Wallpapers.qml index 74dc578..58adb56 100644 --- a/Services/Wallpapers.qml +++ b/Services/Wallpapers.qml @@ -160,6 +160,7 @@ Singleton { running: false stdout: StdioCollector { onStreamFinished: { + //console.log(this.text) } } diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml index 19580e3..9566fcf 100644 --- a/Widgets/NIconButton.qml +++ b/Widgets/NIconButton.qml @@ -42,7 +42,8 @@ Rectangle { font.variableAxes: { "wght": (Font.Normal + Font.Bold) / 2.0 } - color: (root.hovering || showFilled) ? Colors.colorOnPrimary : showBorder ? Colors.colorPrimary : Colors.colorOnSurface + color: (root.hovering + || showFilled) ? Colors.colorOnPrimary : showBorder ? Colors.colorPrimary : Colors.colorOnSurface horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter opacity: root.enabled ? Style.opacityFull : Style.opacityMedium diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml index 7994229..2c61e96 100644 --- a/Widgets/NToggle.qml +++ b/Widgets/NToggle.qml @@ -53,8 +53,8 @@ RowLayout { implicitWidth: (root.baseSize - 5) * scaling implicitHeight: (root.baseSize - 5) * scaling radius: height * 0.5 - color: value ? Colors.colorOnSurface : Colors.colorPrimary //Colors.onBackground : Colors.colorSecondary - border.color: value ? Colors.colorSurface: Colors.colorSurface + color: value ? Colors.colorOnSurface : Colors.colorPrimary //Colors.onBackground : Colors.colorSecondary + border.color: value ? Colors.colorSurface : Colors.colorSurface border.width: Math.max(1, Style.borderMedium * scaling) y: 2 * scaling x: value ? switcher.width - width - 2 * scaling : 2 * scaling