never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Colors: switched all hovers and focus ring to a more vibrant mSecondary (instead of tertiary)

Browse source
This commit is contained in:
LemmyCook 2025-08-22 09:11:04 -04:00
parent 7a826bf93f
commit 168500a0b3
12 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/Bar/BluetoothPanel.qml
View file

@ -118,7 +118,7 @@ NPanel {
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
color: { color: {
if (availableDeviceArea.containsMouse && !isBusy) if (availableDeviceArea.containsMouse && !isBusy)
return Color.mTertiary return Color.mSecondary
if (modelData.pairing || modelData.state === BluetoothDeviceState.Connecting) if (modelData.pairing || modelData.state === BluetoothDeviceState.Connecting)
return Color.mPrimary return Color.mPrimary

2
Modules/Bar/TrayMenu.qml
View file

@ -134,7 +134,7 @@ PopupWindow {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: mouseArea.containsMouse ? Color.mTertiary : Color.transparent color: mouseArea.containsMouse ? Color.mSecondary : Color.transparent
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
visible: !(modelData?.isSeparator ?? false) visible: !(modelData?.isSeparator ?? false)

2
Modules/Bar/WiFiPanel.qml
View file

@ -147,7 +147,7 @@ NPanel {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: Style.baseWidgetSize * 1.5 * scaling Layout.preferredHeight: Style.baseWidgetSize * 1.5 * scaling
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
color: modelData.connected ? Color.mPrimary : (networkMouseArea.containsMouse ? Color.mTertiary : Color.transparent) color: modelData.connected ? Color.mPrimary : (networkMouseArea.containsMouse ? Color.mSecondary : Color.transparent)
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent

4
Modules/Launcher/Launcher.qml
View file

@ -225,7 +225,7 @@ NPanel {
Layout.bottomMargin: Style.marginM * scaling Layout.bottomMargin: Style.marginM * scaling
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
color: Color.mSurface color: Color.mSurface
border.color: searchInput.activeFocus ? Color.mTertiary : Color.mOutline border.color: searchInput.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Math.max(1, searchInput.activeFocus ? Style.borderM * scaling : Style.borderS * scaling) border.width: Math.max(1, searchInput.activeFocus ? Style.borderM * scaling : Style.borderS * scaling)
Item { Item {
@ -355,7 +355,7 @@ NPanel {
height: 65 * scaling height: 65 * scaling
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
property bool isSelected: index === selectedIndex property bool isSelected: index === selectedIndex
color: (appCardArea.containsMouse || isSelected) ? Color.mTertiary : Color.mSurface color: (appCardArea.containsMouse || isSelected) ? Color.mSecondary : Color.mSurface
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {

2
Modules/Notification/NotificationHistoryPanel.qml
View file

@ -111,7 +111,7 @@ NPanel {
width: notificationList ? notificationList.width : 380 * scaling width: notificationList ? notificationList.width : 380 * scaling
height: Math.max(80, notificationContent.height + 30) height: Math.max(80, notificationContent.height + 30)
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
color: notificationMouseArea.containsMouse ? Color.mTertiary : Color.mSurfaceVariant color: notificationMouseArea.containsMouse ? Color.mSecondary : Color.mSurfaceVariant
RowLayout { RowLayout {
anchors { anchors {

2
Modules/PowerPanel/PowerPanel.qml
View file

@ -215,7 +215,7 @@ NPanel {
if (pending) if (pending)
return Color.applyOpacity(Color.mPrimary, "20") return Color.applyOpacity(Color.mPrimary, "20")
if (mouseArea.containsMouse) if (mouseArea.containsMouse)
return Color.mTertiary return Color.mSecondary
return Color.transparent return Color.transparent
} }

2
Modules/SettingsPanel/SettingsPanel.qml
View file

@ -202,7 +202,7 @@ NPanel {
width: parent.width width: parent.width
height: 32 * scaling height: 32 * scaling
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mTertiary : Color.transparent) color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mSecondary : Color.transparent)
readonly property bool selected: index === currentTabIndex readonly property bool selected: index === currentTabIndex
property bool hovering: false property bool hovering: false
property color tabTextColor: selected ? Color.mOnPrimary : (tabItem.hovering ? Color.mOnTertiary : Color.mOnSurface) property color tabTextColor: selected ? Color.mOnPrimary : (tabItem.hovering ? Color.mOnTertiary : Color.mOnSurface)

2
Modules/SettingsPanel/Tabs/AboutTab.qml
View file

@ -199,7 +199,7 @@ ColumnLayout {
width: contributorsGrid.cellWidth - Style.marginL * scaling width: contributorsGrid.cellWidth - Style.marginL * scaling
height: contributorsGrid.cellHeight - Style.marginXS * scaling height: contributorsGrid.cellHeight - Style.marginXS * scaling
radius: Style.radiusL * scaling radius: Style.radiusL * scaling
color: contributorArea.containsMouse ? Color.mTertiary : Color.transparent color: contributorArea.containsMouse ? Color.mSecondary : Color.transparent
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent

4
Modules/SidePanel/Cards/MediaCard.qml
View file

@ -76,7 +76,7 @@ NBox {
// implicitWidth: 120 * scaling // implicitWidth: 120 * scaling
// implicitHeight: 30 * scaling // implicitHeight: 30 * scaling
color: Color.transparent color: Color.transparent
border.color: playerSelector.activeFocus ? Color.mTertiary : Color.mOutline border.color: playerSelector.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
} }
@ -138,7 +138,7 @@ NBox {
background: Rectangle { background: Rectangle {
width: popup.width - Style.marginS * scaling * 2 width: popup.width - Style.marginS * scaling * 2
color: highlighted ? Color.mTertiary : Color.transparent color: highlighted ? Color.mSecondary : Color.transparent
radius: Style.radiusXS * scaling radius: Style.radiusXS * scaling
} }
} }

1
Services/ColorSchemeService.qml
View file

@ -90,6 +90,7 @@ Singleton {
id: colorsWriter id: colorsWriter
path: colorsJsonFilePath path: colorsJsonFilePath
onSaved: { onSaved: {
// Logger.log("ColorScheme", "Colors saved") // Logger.log("ColorScheme", "Colors saved")
} }
JsonAdapter { JsonAdapter {

4
Widgets/NComboBox.qml
View file

@ -50,7 +50,7 @@ ColumnLayout {
implicitWidth: Style.baseWidgetSize * 3.75 * scaling implicitWidth: Style.baseWidgetSize * 3.75 * scaling
implicitHeight: preferredHeight implicitHeight: preferredHeight
color: Color.mSurface color: Color.mSurface
border.color: combo.activeFocus ? Color.mTertiary : Color.mOutline border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
} }
@ -112,7 +112,7 @@ ColumnLayout {
background: Rectangle { background: Rectangle {
width: combo.width - Style.marginM * scaling * 3 width: combo.width - Style.marginM * scaling * 3
color: highlighted ? Color.mTertiary : Color.transparent color: highlighted ? Color.mSecondary : Color.transparent
radius: Style.radiusS * scaling radius: Style.radiusS * scaling
} }
} }

2
Widgets/NTextInput.qml
View file

@ -46,7 +46,7 @@ Item {
anchors.fill: parent anchors.fill: parent
radius: frame.radius radius: frame.radius
color: Color.transparent color: Color.transparent
border.color: input.activeFocus ? Color.mTertiary : Color.transparent border.color: input.activeFocus ? Color.mSecondary : Color.transparent
border.width: input.activeFocus ? Math.max(1, Style.borderS * scaling) : 0 border.width: input.activeFocus ? Math.max(1, Style.borderS * scaling) : 0
} }