kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

quickshell: use more .colors (rather than .m3colors)

Browse Source
This commit is contained in:
end-4
2025-06-12 00:12:24 +02:00
parent 1721c2bbb2
commit b7b183d2ca
39 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/quickshell/modules/backgroundWidgets/BackgroundWidgets.qml
+4 -4
View File
@@ -17,17 +17,17 @@ Scope {
property string filePath: `${Directories.state}/user/generated/wallpaper/least_busy_region.json` property string filePath: `${Directories.state}/user/generated/wallpaper/least_busy_region.json`
property real centerX: 0 property real centerX: 0
property real centerY: 0 property real centerY: 0
property color dominantColor: Appearance.m3colors.m3primary property color dominantColor: Appearance.colors.colPrimary
property bool dominantColorIsDark: dominantColor.hslLightness < 0.5 property bool dominantColorIsDark: dominantColor.hslLightness < 0.5
property color colBackground: ColorUtils.transparentize(ColorUtils.mix(Appearance.m3colors.m3primary, Appearance.m3colors.m3secondaryContainer), 1) property color colBackground: ColorUtils.transparentize(ColorUtils.mix(Appearance.colors.colPrimary, Appearance.colors.colSecondaryContainer), 1)
property color colText: ColorUtils.colorWithLightness(Appearance.m3colors.m3primary, (root.dominantColorIsDark ? 0.8 : 0.12)) property color colText: ColorUtils.colorWithLightness(Appearance.colors.colPrimary, (root.dominantColorIsDark ? 0.8 : 0.12))
function updateWidgetPosition(fileContent) { function updateWidgetPosition(fileContent) {
// console.log("[BackgroundWidgets] Updating widget position with content:", fileContent) // console.log("[BackgroundWidgets] Updating widget position with content:", fileContent)
const parsedContent = JSON.parse(fileContent) const parsedContent = JSON.parse(fileContent)
root.centerX = parsedContent.center_x root.centerX = parsedContent.center_x
root.centerY = parsedContent.center_y root.centerY = parsedContent.center_y
root.dominantColor = parsedContent.dominant_color || Appearance.m3colors.m3primary root.dominantColor = parsedContent.dominant_color || Appearance.colors.colPrimary
} }
Timer { Timer {
.config/quickshell/modules/bar/Bar.qml
+3 -3
View File
@@ -24,7 +24,7 @@ Scope {
Layout.bottomMargin: barHeight / 3 Layout.bottomMargin: barHeight / 3
Layout.fillHeight: true Layout.fillHeight: true
implicitWidth: 1 implicitWidth: 1
color: Appearance.m3colors.m3outlineVariant color: Appearance.colors.colOutlineVariant
} }
Variants { // For each monitor Variants { // For each monitor
@@ -149,7 +149,7 @@ Scope {
colBackground: barLeftSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1) colBackground: barLeftSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1)
colBackgroundHover: Appearance.colors.colLayer1Hover colBackgroundHover: Appearance.colors.colLayer1Hover
colRipple: Appearance.colors.colLayer1Active colRipple: Appearance.colors.colLayer1Active
colBackgroundToggled: Appearance.m3colors.m3secondaryContainer colBackgroundToggled: Appearance.colors.colSecondaryContainer
colBackgroundToggledHover: Appearance.colors.colSecondaryContainerHover colBackgroundToggledHover: Appearance.colors.colSecondaryContainerHover
colRippleToggled: Appearance.colors.colSecondaryContainerActive colRippleToggled: Appearance.colors.colSecondaryContainerActive
toggled: GlobalStates.sidebarLeftOpen toggled: GlobalStates.sidebarLeftOpen
@@ -346,7 +346,7 @@ Scope {
colBackground: barRightSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1) colBackground: barRightSideMouseArea.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1)
colBackgroundHover: Appearance.colors.colLayer1Hover colBackgroundHover: Appearance.colors.colLayer1Hover
colRipple: Appearance.colors.colLayer1Active colRipple: Appearance.colors.colLayer1Active
colBackgroundToggled: Appearance.m3colors.m3secondaryContainer colBackgroundToggled: Appearance.colors.colSecondaryContainer
colBackgroundToggledHover: Appearance.colors.colSecondaryContainerHover colBackgroundToggledHover: Appearance.colors.colSecondaryContainerHover
colRippleToggled: Appearance.colors.colSecondaryContainerActive colRippleToggled: Appearance.colors.colSecondaryContainerActive
toggled: GlobalStates.sidebarRightOpen toggled: GlobalStates.sidebarRightOpen
.config/quickshell/modules/bar/BatteryIndicator.qml
+1 -1
View File
@@ -48,7 +48,7 @@ Rectangle {
lineWidth: 2 lineWidth: 2
value: percentage value: percentage
size: 26 size: 26
secondaryColor: (isLow && !isCharging) ? batteryLowBackground : Appearance.m3colors.m3secondaryContainer secondaryColor: (isLow && !isCharging) ? batteryLowBackground : Appearance.colors.colSecondaryContainer
primaryColor: (isLow && !isCharging) ? batteryLowOnBackground : Appearance.m3colors.m3onSecondaryContainer primaryColor: (isLow && !isCharging) ? batteryLowOnBackground : Appearance.m3colors.m3onSecondaryContainer
fill: (isLow && !isCharging) fill: (isLow && !isCharging)
.config/quickshell/modules/bar/Media.qml
+1 -1
View File
@@ -62,7 +62,7 @@ Item {
lineWidth: 2 lineWidth: 2
value: activePlayer?.position / activePlayer?.length value: activePlayer?.position / activePlayer?.length
size: 26 size: 26
secondaryColor: Appearance.m3colors.m3secondaryContainer secondaryColor: Appearance.colors.colSecondaryContainer
primaryColor: Appearance.m3colors.m3onSecondaryContainer primaryColor: Appearance.m3colors.m3onSecondaryContainer
MaterialSymbol { MaterialSymbol {
.config/quickshell/modules/bar/Resource.qml
+1 -1
View File
@@ -23,7 +23,7 @@ Item {
lineWidth: 2 lineWidth: 2
value: percentage value: percentage
size: 26 size: 26
secondaryColor: Appearance.m3colors.m3secondaryContainer secondaryColor: Appearance.colors.colSecondaryContainer
primaryColor: Appearance.m3colors.m3onSecondaryContainer primaryColor: Appearance.m3colors.m3onSecondaryContainer
MaterialSymbol { MaterialSymbol {
.config/quickshell/modules/bar/Workspaces.qml
+1 -1
View File
@@ -109,7 +109,7 @@ Item {
topRightRadius: radiusRight topRightRadius: radiusRight
bottomRightRadius: radiusRight bottomRightRadius: radiusRight
color: ColorUtils.transparentize(Appearance.m3colors.m3secondaryContainer, 0.4) color: ColorUtils.transparentize(Appearance.colors.colSecondaryContainer, 0.4)
opacity: (workspaceOccupied[index] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+1)) ? 1 : 0 opacity: (workspaceOccupied[index] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+1)) ? 1 : 0
Behavior on opacity { Behavior on opacity {
.config/quickshell/modules/common/Appearance.qml
+12 -5
View File
@@ -15,11 +15,11 @@ Singleton {
property QtObject sizes property QtObject sizes
property string syntaxHighlightingTheme property string syntaxHighlightingTheme
// [!] Enabling transparency can affect readability when using light theme. // Extremely conservative transparency values for consistency and readability
property real transparency: 0 property real transparency: 0
property real contentTransparency: 0 property real contentTransparency: 0
// property real transparency: 0.15 // property real transparency: m3colors.darkmode ? 0.05 : 0
// property real contentTransparency: 0.5 // property real contentTransparency: m3colors.darkmode ? 0.18 : 0
m3colors: QtObject { m3colors: QtObject {
property bool darkmode: false property bool darkmode: false
@@ -106,10 +106,10 @@ Singleton {
property color colOnLayer0: m3colors.m3onBackground property color colOnLayer0: m3colors.m3onBackground
property color colLayer0Hover: ColorUtils.transparentize(ColorUtils.mix(colLayer0, colOnLayer0, 0.9, root.contentTransparency)) property color colLayer0Hover: ColorUtils.transparentize(ColorUtils.mix(colLayer0, colOnLayer0, 0.9, root.contentTransparency))
property color colLayer0Active: ColorUtils.transparentize(ColorUtils.mix(colLayer0, colOnLayer0, 0.8, root.contentTransparency)) property color colLayer0Active: ColorUtils.transparentize(ColorUtils.mix(colLayer0, colOnLayer0, 0.8, root.contentTransparency))
property color colLayer1: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainerLow, m3colors.m3background, 0.7), root.contentTransparency); property color colLayer1: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainerLow, m3colors.m3background, 0.8), root.contentTransparency);
property color colOnLayer1: m3colors.m3onSurfaceVariant; property color colOnLayer1: m3colors.m3onSurfaceVariant;
property color colOnLayer1Inactive: ColorUtils.mix(colOnLayer1, colLayer1, 0.45); property color colOnLayer1Inactive: ColorUtils.mix(colOnLayer1, colLayer1, 0.45);
property color colLayer2: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainer, m3colors.m3surfaceContainerHigh, 0.55), root.contentTransparency) property color colLayer2: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainer, m3colors.m3surfaceContainerHigh, 0.7), root.contentTransparency)
property color colOnLayer2: m3colors.m3onSurface; property color colOnLayer2: m3colors.m3onSurface;
property color colOnLayer2Disabled: ColorUtils.mix(colOnLayer2, m3colors.m3background, 0.4); property color colOnLayer2Disabled: ColorUtils.mix(colOnLayer2, m3colors.m3background, 0.4);
property color colLayer3: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainerHigh, m3colors.m3onSurface, 0.96), root.contentTransparency) property color colLayer3: ColorUtils.transparentize(ColorUtils.mix(m3colors.m3surfaceContainerHigh, m3colors.m3onSurface, 0.96), root.contentTransparency)
@@ -127,16 +127,23 @@ Singleton {
property color colPrimaryContainer: m3colors.m3primaryContainer property color colPrimaryContainer: m3colors.m3primaryContainer
property color colPrimaryContainerHover: ColorUtils.mix(colors.colPrimaryContainer, colLayer1Hover, 0.7) property color colPrimaryContainerHover: ColorUtils.mix(colors.colPrimaryContainer, colLayer1Hover, 0.7)
property color colPrimaryContainerActive: ColorUtils.mix(colors.colPrimaryContainer, colLayer1Active, 0.6) property color colPrimaryContainerActive: ColorUtils.mix(colors.colPrimaryContainer, colLayer1Active, 0.6)
property color colSecondary: m3colors.m3secondary
property color colSecondaryHover: ColorUtils.mix(m3colors.m3secondary, colLayer1Hover, 0.85) property color colSecondaryHover: ColorUtils.mix(m3colors.m3secondary, colLayer1Hover, 0.85)
property color colSecondaryActive: ColorUtils.mix(m3colors.m3secondary, colLayer1Active, 0.4) property color colSecondaryActive: ColorUtils.mix(m3colors.m3secondary, colLayer1Active, 0.4)
property color colSecondaryContainer: ColorUtils.transparentize(m3colors.m3secondaryContainer, root.contentTransparency)
property color colSecondaryContainerHover: ColorUtils.mix(m3colors.m3secondaryContainer, colLayer1Hover, 0.6) property color colSecondaryContainerHover: ColorUtils.mix(m3colors.m3secondaryContainer, colLayer1Hover, 0.6)
property color colSecondaryContainerActive: ColorUtils.mix(m3colors.m3secondaryContainer, colLayer1Active, 0.54) property color colSecondaryContainerActive: ColorUtils.mix(m3colors.m3secondaryContainer, colLayer1Active, 0.54)
property color colSurfaceContainerLow: ColorUtils.transparentize(m3colors.m3surfaceContainerLow, root.contentTransparency)
property color colSurfaceContainer: ColorUtils.transparentize(m3colors.m3surfaceContainer, root.contentTransparency)
property color colSurfaceContainerHigh: ColorUtils.transparentize(m3colors.m3surfaceContainerHigh, root.contentTransparency)
property color colSurfaceContainerHighest: ColorUtils.transparentize(m3colors.m3surfaceContainerHighest, root.contentTransparency)
property color colSurfaceContainerHighestHover: ColorUtils.mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.95) property color colSurfaceContainerHighestHover: ColorUtils.mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.95)
property color colSurfaceContainerHighestActive: ColorUtils.mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.85) property color colSurfaceContainerHighestActive: ColorUtils.mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.85)
property color colTooltip: m3colors.darkmode ? ColorUtils.mix(m3colors.m3background, "#3C4043", 0.5) : "#3C4043" // m3colors.m3inverseSurface in the specs, but the m3 website actually uses #3C4043 property color colTooltip: m3colors.darkmode ? ColorUtils.mix(m3colors.m3background, "#3C4043", 0.5) : "#3C4043" // m3colors.m3inverseSurface in the specs, but the m3 website actually uses #3C4043
property color colOnTooltip: "#F8F9FA" // m3colors.m3inverseOnSurface in the specs, but the m3 website actually uses this color property color colOnTooltip: "#F8F9FA" // m3colors.m3inverseOnSurface in the specs, but the m3 website actually uses this color
property color colScrim: ColorUtils.transparentize(m3colors.m3scrim, 0.5) property color colScrim: ColorUtils.transparentize(m3colors.m3scrim, 0.5)
property color colShadow: ColorUtils.transparentize(m3colors.m3shadow, 0.7) property color colShadow: ColorUtils.transparentize(m3colors.m3shadow, 0.7)
property color colOutlineVariant: m3colors.m3outlineVariant
} }
rounding: QtObject { rounding: QtObject {
.config/quickshell/modules/common/widgets/CircularProgress.qml
+1 -1
View File
@@ -14,7 +14,7 @@ Item {
property int lineWidth: 2 property int lineWidth: 2
property real value: 0 property real value: 0
property color primaryColor: Appearance.m3colors.m3onSecondaryContainer property color primaryColor: Appearance.m3colors.m3onSecondaryContainer
property color secondaryColor: Appearance.m3colors.m3secondaryContainer property color secondaryColor: Appearance.colors.colSecondaryContainer
property real gapAngle: Math.PI / 9 property real gapAngle: Math.PI / 9
property bool fill: false property bool fill: false
property int fillOverflow: 2 property int fillOverflow: 2
.config/quickshell/modules/common/widgets/KeyboardKey.qml
+1 -1
View File
@@ -15,7 +15,7 @@ Rectangle {
property real extraBottomBorderWidth: 2 property real extraBottomBorderWidth: 2
property color borderColor: Appearance.colors.colOnLayer0 property color borderColor: Appearance.colors.colOnLayer0
property real borderRadius: 5 property real borderRadius: 5
property color keyColor: Appearance.m3colors.m3surfaceContainerLow property color keyColor: Appearance.colors.colSurfaceContainerLow
implicitWidth: keyFace.implicitWidth + borderWidth * 2 implicitWidth: keyFace.implicitWidth + borderWidth * 2
implicitHeight: keyFace.implicitHeight + borderWidth * 2 + extraBottomBorderWidth implicitHeight: keyFace.implicitHeight + borderWidth * 2 + extraBottomBorderWidth
radius: borderRadius radius: borderRadius
.config/quickshell/modules/common/widgets/NavRailButton.qml
+1 -1
View File
@@ -30,7 +30,7 @@ Button {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
radius: Appearance.rounding.full radius: Appearance.rounding.full
color: toggled ? color: toggled ?
(button.down ? Appearance.colors.colSecondaryContainerActive : button.hovered ? Appearance.colors.colSecondaryContainerHover : Appearance.m3colors.m3secondaryContainer) : (button.down ? Appearance.colors.colSecondaryContainerActive : button.hovered ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colSecondaryContainer) :
(button.down ? Appearance.colors.colLayer1Active : button.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1)) (button.down ? Appearance.colors.colLayer1Active : button.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1))
Behavior on color { Behavior on color {
.config/quickshell/modules/common/widgets/NotificationActionButton.qml
+1 -1
View File
@@ -15,7 +15,7 @@ RippleButton {
leftPadding: 15 leftPadding: 15
rightPadding: 15 rightPadding: 15
buttonRadius: Appearance.rounding.small buttonRadius: Appearance.rounding.small
colBackground: (urgency == NotificationUrgency.Critical) ? Appearance.m3colors.m3secondaryContainer : Appearance.m3colors.m3surfaceContainerHighest colBackground: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainer : Appearance.colors.colSurfaceContainerHighest
colBackgroundHover: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colSurfaceContainerHighestHover colBackgroundHover: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colSurfaceContainerHighestHover
colRipple: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerActive : Appearance.colors.colSurfaceContainerHighestActive colRipple: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerActive : Appearance.colors.colSurfaceContainerHighestActive
.config/quickshell/modules/common/widgets/NotificationAppIcon.qml
+1 -1
View File
@@ -26,7 +26,7 @@ Rectangle { // App icon
implicitWidth: size implicitWidth: size
implicitHeight: size implicitHeight: size
radius: Appearance.rounding.full radius: Appearance.rounding.full
color: Appearance.m3colors.m3secondaryContainer color: Appearance.colors.colSecondaryContainer
Loader { Loader {
id: materialSymbolLoader id: materialSymbolLoader
active: root.appIcon == "" active: root.appIcon == ""
.config/quickshell/modules/common/widgets/NotificationGroup.qml
+1 -1
View File
@@ -113,7 +113,7 @@ Item { // Notification group area
id: background id: background
anchors.left: parent.left anchors.left: parent.left
width: parent.width width: parent.width
color: Appearance.m3colors.m3surfaceContainer color: Appearance.colors.colSurfaceContainer
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
anchors.leftMargin: root.xOffset anchors.leftMargin: root.xOffset
.config/quickshell/modules/common/widgets/NotificationItem.qml
+3 -3
View File
@@ -129,9 +129,9 @@ Item { // Notification item area
color: (expanded && !onlyNotification) ? color: (expanded && !onlyNotification) ?
(notificationObject.urgency == NotificationUrgency.Critical) ? (notificationObject.urgency == NotificationUrgency.Critical) ?
ColorUtils.mix(Appearance.m3colors.m3secondaryContainer, Appearance.colors.colLayer2, 0.35) : ColorUtils.mix(Appearance.colors.colSecondaryContainer, Appearance.colors.colLayer2, 0.35) :
(Appearance.m3colors.m3surfaceContainerHigh) : (Appearance.colors.colSurfaceContainerHigh) :
ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHighest) ColorUtils.transparentize(Appearance.colors.colSurfaceContainerHighest)
implicitHeight: expanded ? (contentColumn.implicitHeight + padding * 2) : summaryRow.implicitHeight implicitHeight: expanded ? (contentColumn.implicitHeight + padding * 2) : summaryRow.implicitHeight
Behavior on implicitHeight { Behavior on implicitHeight {
.config/quickshell/modules/common/widgets/SelectionDialog.qml
+1 -1
View File
@@ -34,7 +34,7 @@ Item {
Rectangle { // The dialog Rectangle { // The dialog
id: dialog id: dialog
color: Appearance.m3colors.m3surfaceContainerHigh color: Appearance.colors.colSurfaceContainerHigh
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
anchors.fill: parent anchors.fill: parent
anchors.margins: dialogMargin anchors.margins: dialogMargin
.config/quickshell/modules/common/widgets/StyledSlider.qml
+1 -1
View File
@@ -19,7 +19,7 @@ Slider {
property real handleLimit: root.backgroundDotMargins property real handleLimit: root.backgroundDotMargins
property real trackHeight: 30 * scale property real trackHeight: 30 * scale
property color highlightColor: Appearance.colors.colPrimary property color highlightColor: Appearance.colors.colPrimary
property color trackColor: Appearance.m3colors.m3secondaryContainer property color trackColor: Appearance.colors.colSecondaryContainer
property color handleColor: Appearance.m3colors.m3onSecondaryContainer property color handleColor: Appearance.m3colors.m3onSecondaryContainer
property real trackRadius: Appearance.rounding.verysmall * scale property real trackRadius: Appearance.rounding.verysmall * scale
property real unsharpenRadius: Appearance.rounding.unsharpen property real unsharpenRadius: Appearance.rounding.unsharpen
.config/quickshell/modules/common/widgets/StyledSwitch.qml
+1 -1
View File
@@ -13,7 +13,7 @@ Switch {
implicitHeight: 32 * root.scale implicitHeight: 32 * root.scale
implicitWidth: 52 * root.scale implicitWidth: 52 * root.scale
property color activeColor: Appearance?.colors.colPrimary ?? "#685496" property color activeColor: Appearance?.colors.colPrimary ?? "#685496"
property color inactiveColor: Appearance?.m3colors.m3surfaceContainerHighest ?? "#45464F" property color inactiveColor: Appearance?.colors.colSurfaceContainerHighest ?? "#45464F"
PointingHandInteraction {} PointingHandInteraction {}
.config/quickshell/modules/common/widgets/StyledTextArea.qml
+1 -1
View File
@@ -5,7 +5,7 @@ import QtQuick.Controls
TextArea { TextArea {
renderType: Text.NativeRendering renderType: Text.NativeRendering
selectedTextColor: Appearance.m3colors.m3onSecondaryContainer selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
selectionColor: Appearance.m3colors.m3secondaryContainer selectionColor: Appearance.colors.colSecondaryContainer
placeholderTextColor: Appearance.m3colors.m3outline placeholderTextColor: Appearance.m3colors.m3outline
font { font {
family: Appearance?.font.family.main ?? "sans-serif" family: Appearance?.font.family.main ?? "sans-serif"
.config/quickshell/modules/dock/DockAppButton.qml
+1 -1
View File
@@ -106,7 +106,7 @@ DockButton {
implicitWidth: (appToplevel.toplevels.length <= 3) ? implicitWidth: (appToplevel.toplevels.length <= 3) ?
root.countDotWidth : root.countDotHeight // Circles when too many root.countDotWidth : root.countDotHeight // Circles when too many
implicitHeight: root.countDotHeight implicitHeight: root.countDotHeight
color: appIsActive ? Appearance.m3colors.m3primary : ColorUtils.transparentize(Appearance.colors.colOnLayer0, 0.4) color: appIsActive ? Appearance.colors.colPrimary : ColorUtils.transparentize(Appearance.colors.colOnLayer0, 0.4)
} }
} }
} }
.config/quickshell/modules/dock/DockApps.qml
+3 -3
View File
@@ -166,7 +166,7 @@ Item {
animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this) animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
} }
clip: true clip: true
color: Appearance.m3colors.m3surfaceContainer color: Appearance.colors.colSurfaceContainer
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: Appearance.sizes.elevationMargin anchors.bottomMargin: Appearance.sizes.elevationMargin
@@ -205,7 +205,7 @@ Item {
contentWidth: parent.width - anchors.margins * 2 contentWidth: parent.width - anchors.margins * 2
WrapperRectangle { WrapperRectangle {
Layout.fillWidth: true Layout.fillWidth: true
color: ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainer) color: ColorUtils.transparentize(Appearance.colors.colSurfaceContainer)
radius: Appearance.rounding.small radius: Appearance.rounding.small
margin: 5 margin: 5
StyledText { StyledText {
@@ -218,7 +218,7 @@ Item {
} }
GroupButton { GroupButton {
id: closeButton id: closeButton
colBackground: ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainer) colBackground: ColorUtils.transparentize(Appearance.colors.colSurfaceContainer)
baseWidth: windowControlsHeight baseWidth: windowControlsHeight
baseHeight: windowControlsHeight baseHeight: windowControlsHeight
buttonRadius: Appearance.rounding.full buttonRadius: Appearance.rounding.full
.config/quickshell/modules/dock/DockSeparator.qml
+1 -1
View File
@@ -9,5 +9,5 @@ Rectangle {
Layout.bottomMargin: Appearance.sizes.hyprlandGapsOut + dockRow.padding + Appearance.rounding.normal Layout.bottomMargin: Appearance.sizes.hyprlandGapsOut + dockRow.padding + Appearance.rounding.normal
Layout.fillHeight: true Layout.fillHeight: true
implicitWidth: 1 implicitWidth: 1
color: Appearance.m3colors.m3outlineVariant color: Appearance.colors.colOutlineVariant
} }
.config/quickshell/modules/onScreenKeyboard/OnScreenKeyboard.qml
+1 -1
View File
@@ -111,7 +111,7 @@ Scope { // Scope
Layout.bottomMargin: 20 Layout.bottomMargin: 20
Layout.fillHeight: true Layout.fillHeight: true
implicitWidth: 1 implicitWidth: 1
color: Appearance.m3colors.m3outlineVariant color: Appearance.colors.colOutlineVariant
} }
OskContent { OskContent {
id: oskContent id: oskContent
.config/quickshell/modules/overview/OverviewWidget.qml
+1 -1
View File
@@ -25,7 +25,7 @@ Item {
property var windowAddresses: HyprlandData.addresses property var windowAddresses: HyprlandData.addresses
property var monitorData: HyprlandData.monitors.find(m => m.id === root.monitor.id) property var monitorData: HyprlandData.monitors.find(m => m.id === root.monitor.id)
property real scale: ConfigOptions.overview.scale property real scale: ConfigOptions.overview.scale
property color activeBorderColor: Appearance.m3colors.m3secondary property color activeBorderColor: Appearance.colors.colSecondary
property real workspaceImplicitWidth: (monitorData?.transform % 2 === 1) ? property real workspaceImplicitWidth: (monitorData?.transform % 2 === 1) ?
((monitor.height - monitorData?.reserved[0] - monitorData?.reserved[2]) * root.scale / monitor.scale) : ((monitor.height - monitorData?.reserved[0] - monitorData?.reserved[2]) * root.scale / monitor.scale) :
.config/quickshell/modules/overview/SearchItem.qml
+1 -1
View File
@@ -80,7 +80,7 @@ RippleButton {
buttonRadius: Appearance.rounding.normal buttonRadius: Appearance.rounding.normal
colBackground: (root.down || root.keyboardDown) ? Appearance.colors.colLayer1Active : colBackground: (root.down || root.keyboardDown) ? Appearance.colors.colLayer1Active :
((root.hovered || root.focus) ? Appearance.colors.colLayer1Hover : ((root.hovered || root.focus) ? Appearance.colors.colLayer1Hover :
ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHigh, 1)) ColorUtils.transparentize(Appearance.colors.colSurfaceContainerHigh, 1))
colBackgroundHover: Appearance.colors.colLayer1Hover colBackgroundHover: Appearance.colors.colLayer1Hover
colRipple: Appearance.colors.colLayer1Active colRipple: Appearance.colors.colLayer1Active
.config/quickshell/modules/overview/SearchWidget.qml
+2 -2
View File
@@ -219,7 +219,7 @@ Item { // Wrapper
} }
color: activeFocus ? Appearance.m3colors.m3onSurface : Appearance.m3colors.m3onSurfaceVariant color: activeFocus ? Appearance.m3colors.m3onSurface : Appearance.m3colors.m3onSurfaceVariant
selectedTextColor: Appearance.m3colors.m3onSecondaryContainer selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
selectionColor: Appearance.m3colors.m3secondaryContainer selectionColor: Appearance.colors.colSecondaryContainer
placeholderText: qsTr("Search, calculate or run") placeholderText: qsTr("Search, calculate or run")
placeholderTextColor: Appearance.m3colors.m3outline placeholderTextColor: Appearance.m3colors.m3outline
implicitWidth: root.searchingText == "" ? Appearance.sizes.searchWidthCollapsed : Appearance.sizes.searchWidth implicitWidth: root.searchingText == "" ? Appearance.sizes.searchWidthCollapsed : Appearance.sizes.searchWidth
@@ -260,7 +260,7 @@ Item { // Wrapper
visible: root.showResults visible: root.showResults
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: Appearance.m3colors.m3outlineVariant color: Appearance.colors.colOutlineVariant
} }
ListView { // App results ListView { // App results
.config/quickshell/modules/session/SessionActionButton.qml
+1 -1
View File
@@ -18,7 +18,7 @@ RippleButton {
buttonRadius: (button.focus || button.down) ? size / 2 : Appearance.rounding.verylarge buttonRadius: (button.focus || button.down) ? size / 2 : Appearance.rounding.verylarge
colBackground: button.keyboardDown ? Appearance.colors.colSecondaryContainerActive : colBackground: button.keyboardDown ? Appearance.colors.colSecondaryContainerActive :
button.focus ? Appearance.colors.colPrimary : button.focus ? Appearance.colors.colPrimary :
Appearance.m3colors.m3secondaryContainer Appearance.colors.colSecondaryContainer
colBackgroundHover: Appearance.colors.colPrimary colBackgroundHover: Appearance.colors.colPrimary
colRipple: Appearance.colors.colPrimaryActive colRipple: Appearance.colors.colPrimaryActive
property color colText: (button.down || button.keyboardDown || button.focus || button.hovered) ? property color colText: (button.down || button.keyboardDown || button.focus || button.hovered) ?
.config/quickshell/modules/sidebarLeft/AiChat.qml
+1 -1
View File
@@ -345,7 +345,7 @@ Inline w/ backslash and round brackets \\(e^{i\\pi} + 1 = 0\\)
implicitHeight: Math.max(inputFieldRowLayout.implicitHeight + inputFieldRowLayout.anchors.topMargin implicitHeight: Math.max(inputFieldRowLayout.implicitHeight + inputFieldRowLayout.anchors.topMargin
+ commandButtonsRow.implicitHeight + commandButtonsRow.anchors.bottomMargin + columnSpacing, 45) + commandButtonsRow.implicitHeight + commandButtonsRow.anchors.bottomMargin + columnSpacing, 45)
clip: true clip: true
border.color: Appearance.m3colors.m3outlineVariant border.color: Appearance.colors.colOutlineVariant
border.width: 1 border.width: 1
Behavior on implicitHeight { Behavior on implicitHeight {
.config/quickshell/modules/sidebarLeft/Anime.qml
+1 -1
View File
@@ -359,7 +359,7 @@ Item {
implicitHeight: Math.max(inputFieldRowLayout.implicitHeight + inputFieldRowLayout.anchors.topMargin implicitHeight: Math.max(inputFieldRowLayout.implicitHeight + inputFieldRowLayout.anchors.topMargin
+ commandButtonsRow.implicitHeight + commandButtonsRow.anchors.bottomMargin + columnSpacing, 45) + commandButtonsRow.implicitHeight + commandButtonsRow.anchors.bottomMargin + columnSpacing, 45)
clip: true clip: true
border.color: Appearance.m3colors.m3outlineVariant border.color: Appearance.colors.colOutlineVariant
border.width: 1 border.width: 1
Behavior on implicitHeight { Behavior on implicitHeight {
.config/quickshell/modules/sidebarLeft/aiChat/AiMessage.qml
+1 -1
View File
@@ -91,7 +91,7 @@ Rectangle {
Rectangle { // Name Rectangle { // Name
id: nameWrapper id: nameWrapper
color: Appearance.m3colors.m3secondaryContainer color: Appearance.colors.colSecondaryContainer
// color: "transparent" // color: "transparent"
radius: Appearance.rounding.small radius: Appearance.rounding.small
implicitHeight: Math.max(nameRowLayout.implicitHeight + 5 * 2, 30) implicitHeight: Math.max(nameRowLayout.implicitHeight + 5 * 2, 30)
.config/quickshell/modules/sidebarLeft/aiChat/AnnotationSourceButton.qml
+1 -1
View File
@@ -21,7 +21,7 @@ RippleButton {
leftPadding: (implicitHeight - faviconSize) / 2 leftPadding: (implicitHeight - faviconSize) / 2
rightPadding: 10 rightPadding: 10
buttonRadius: Appearance.rounding.full buttonRadius: Appearance.rounding.full
colBackground: Appearance.m3colors.m3surfaceContainerHighest colBackground: Appearance.colors.colSurfaceContainerHighest
colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover
colRipple: Appearance.colors.colSurfaceContainerHighestActive colRipple: Appearance.colors.colSurfaceContainerHighestActive
.config/quickshell/modules/sidebarLeft/aiChat/MessageCodeBlock.qml
+2 -2
View File
@@ -40,7 +40,7 @@ ColumnLayout {
topRightRadius: codeBlockBackgroundRounding topRightRadius: codeBlockBackgroundRounding
bottomLeftRadius: Appearance.rounding.unsharpen bottomLeftRadius: Appearance.rounding.unsharpen
bottomRightRadius: Appearance.rounding.unsharpen bottomRightRadius: Appearance.rounding.unsharpen
color: Appearance.m3colors.m3surfaceContainerHighest color: Appearance.colors.colSurfaceContainerHighest
implicitHeight: codeBlockTitleBarRowLayout.implicitHeight + codeBlockHeaderPadding * 2 implicitHeight: codeBlockTitleBarRowLayout.implicitHeight + codeBlockHeaderPadding * 2
RowLayout { // Language and buttons RowLayout { // Language and buttons
@@ -209,7 +209,7 @@ ColumnLayout {
font.hintingPreference: Font.PreferNoHinting // Prevent weird bold text font.hintingPreference: Font.PreferNoHinting // Prevent weird bold text
font.pixelSize: Appearance.font.pixelSize.small font.pixelSize: Appearance.font.pixelSize.small
selectedTextColor: Appearance.m3colors.m3onSecondaryContainer selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
selectionColor: Appearance.m3colors.m3secondaryContainer selectionColor: Appearance.colors.colSecondaryContainer
// wrapMode: TextEdit.Wrap // wrapMode: TextEdit.Wrap
color: messageData.thinking ? Appearance.colors.colSubtext : Appearance.colors.colOnLayer1 color: messageData.thinking ? Appearance.colors.colSubtext : Appearance.colors.colOnLayer1
.config/quickshell/modules/sidebarLeft/aiChat/MessageTextBlock.qml
+1 -1
View File
@@ -120,7 +120,7 @@ ColumnLayout {
font.hintingPreference: Font.PreferNoHinting // Prevent weird bold text font.hintingPreference: Font.PreferNoHinting // Prevent weird bold text
font.pixelSize: Appearance.font.pixelSize.small font.pixelSize: Appearance.font.pixelSize.small
selectedTextColor: Appearance.m3colors.m3onSecondaryContainer selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
selectionColor: Appearance.m3colors.m3secondaryContainer selectionColor: Appearance.colors.colSecondaryContainer
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
color: messageData.thinking ? Appearance.colors.colSubtext : Appearance.colors.colOnLayer1 color: messageData.thinking ? Appearance.colors.colSubtext : Appearance.colors.colOnLayer1
textFormat: renderMarkdown ? TextEdit.MarkdownText : TextEdit.PlainText textFormat: renderMarkdown ? TextEdit.MarkdownText : TextEdit.PlainText
.config/quickshell/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
+1 -1
View File
@@ -64,7 +64,7 @@ Item {
Rectangle { // Header background Rectangle { // Header background
id: header id: header
color: Appearance.m3colors.m3surfaceContainerHighest color: Appearance.colors.colSurfaceContainerHighest
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: thinkBlockTitleBarRowLayout.implicitHeight + thinkBlockHeaderPaddingVertical * 2 implicitHeight: thinkBlockTitleBarRowLayout.implicitHeight + thinkBlockHeaderPaddingVertical * 2
.config/quickshell/modules/sidebarLeft/anime/BooruImage.qml
+1 -1
View File
@@ -133,7 +133,7 @@ Button {
opacity: root.showActions ? 1 : 0 opacity: root.showActions ? 1 : 0
visible: opacity > 0 visible: opacity > 0
radius: Appearance.rounding.small radius: Appearance.rounding.small
color: Appearance.m3colors.m3surfaceContainer color: Appearance.colors.colSurfaceContainer
implicitHeight: contextMenuColumnLayout.implicitHeight + radius * 2 implicitHeight: contextMenuColumnLayout.implicitHeight + radius * 2
implicitWidth: contextMenuColumnLayout.implicitWidth implicitWidth: contextMenuColumnLayout.implicitWidth
.config/quickshell/modules/sidebarLeft/anime/BooruResponse.qml
+2 -2
View File
@@ -67,7 +67,7 @@ Rectangle {
RowLayout { // Header RowLayout { // Header
Rectangle { // Provider name Rectangle { // Provider name
id: providerNameWrapper id: providerNameWrapper
color: Appearance.m3colors.m3secondaryContainer color: Appearance.colors.colSecondaryContainer
radius: Appearance.rounding.small radius: Appearance.rounding.small
implicitWidth: providerName.implicitWidth + 10 * 2 implicitWidth: providerName.implicitWidth + 10 * 2
implicitHeight: Math.max(providerName.implicitHeight + 5 * 2, 30) implicitHeight: Math.max(providerName.implicitHeight + 5 * 2, 30)
@@ -269,7 +269,7 @@ Rectangle {
} }
buttonRadius: Appearance.rounding.small buttonRadius: Appearance.rounding.small
colBackground: Appearance.m3colors.m3surfaceContainerHighest colBackground: Appearance.colors.colSurfaceContainerHighest
colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover
colRipple: Appearance.colors.colSurfaceContainerHighestActive colRipple: Appearance.colors.colSurfaceContainerHighestActive
.config/quickshell/modules/sidebarLeft/translator/TextCanvas.qml
+2 -2
View File
@@ -21,9 +21,9 @@ Rectangle {
default property alias actionButtons: actions.data default property alias actionButtons: actions.data
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: Math.max(150, inputColumn.implicitHeight) implicitHeight: Math.max(150, inputColumn.implicitHeight)
color: isInput ? Appearance.colors.colLayer1 : Appearance.m3colors.m3surfaceContainer color: isInput ? Appearance.colors.colLayer1 : Appearance.colors.colSurfaceContainer
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
border.color: isInput ? Appearance.m3colors.m3outlineVariant : "transparent" border.color: isInput ? Appearance.colors.colOutlineVariant : "transparent"
border.width: isInput ? 1 : 0 border.width: isInput ? 1 : 0
signal inputTextChanged(); // Signal emitted when text changes signal inputTextChanged(); // Signal emitted when text changes
.config/quickshell/modules/sidebarRight/calendar/CalendarDayButton.qml
+1 -1
View File
@@ -26,7 +26,7 @@ RippleButton {
font.weight: bold ? Font.DemiBold : Font.Normal font.weight: bold ? Font.DemiBold : Font.Normal
color: (isToday == 1) ? Appearance.m3colors.m3onPrimary : color: (isToday == 1) ? Appearance.m3colors.m3onPrimary :
(isToday == 0) ? Appearance.colors.colOnLayer1 : (isToday == 0) ? Appearance.colors.colOnLayer1 :
Appearance.m3colors.m3outlineVariant Appearance.colors.colOutlineVariant
Behavior on color { Behavior on color {
animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this) animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
.config/quickshell/modules/sidebarRight/todo/TodoWidget.qml
+3 -3
View File
@@ -114,7 +114,7 @@ Item {
id: tabBarBottomBorder id: tabBarBottomBorder
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: Appearance.m3colors.m3outlineVariant color: Appearance.colors.colOutlineVariant
} }
SwipeView { SwipeView {
@@ -228,7 +228,7 @@ Item {
anchors.margins: root.dialogMargins anchors.margins: root.dialogMargins
implicitHeight: dialogColumnLayout.implicitHeight implicitHeight: dialogColumnLayout.implicitHeight
color: Appearance.m3colors.m3surfaceContainerHigh color: Appearance.colors.colSurfaceContainerHigh
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
function addTask() { function addTask() {
@@ -264,7 +264,7 @@ Item {
color: activeFocus ? Appearance.m3colors.m3onSurface : Appearance.m3colors.m3onSurfaceVariant color: activeFocus ? Appearance.m3colors.m3onSurface : Appearance.m3colors.m3onSurfaceVariant
renderType: Text.NativeRendering renderType: Text.NativeRendering
selectedTextColor: Appearance.m3colors.m3onSecondaryContainer selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
selectionColor: Appearance.m3colors.m3secondaryContainer selectionColor: Appearance.colors.colSecondaryContainer
placeholderText: qsTr("Task description") placeholderText: qsTr("Task description")
placeholderTextColor: Appearance.m3colors.m3outline placeholderTextColor: Appearance.m3colors.m3outline
focus: root.showAddDialog focus: root.showAddDialog
.config/quickshell/modules/sidebarRight/volumeMixer/VolumeMixer.qml
+1 -1
View File
@@ -161,7 +161,7 @@ Item {
Rectangle { // The dialog Rectangle { // The dialog
id: dialog id: dialog
color: Appearance.m3colors.m3surfaceContainerHigh color: Appearance.colors.colSurfaceContainerHigh
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right