diff --git a/Modules/Bar/Bluetooth.qml b/Modules/Bar/Bluetooth.qml index 27ab397..7257bc8 100644 --- a/Modules/Bar/Bluetooth.qml +++ b/Modules/Bar/Bluetooth.qml @@ -14,7 +14,7 @@ NIconButton { sizeMultiplier: 0.8 visible: bluetoothEnabled - colorBg: Color.mSurfaceVariant + colorBg: Color.mSurfaceVariant colorFg: Color.mOnSurface colorBorder: Color.transparent colorBorderHover: Color.transparent diff --git a/Modules/Bar/TrayMenu.qml b/Modules/Bar/TrayMenu.qml index 51a2fd2..89fd4f3 100644 --- a/Modules/Bar/TrayMenu.qml +++ b/Modules/Bar/TrayMenu.qml @@ -127,6 +127,7 @@ PopupWindow { NDivider { anchors.centerIn: parent width: parent.width - (Style.marginM * scaling * 2) + color: Color.mPrimary visible: modelData?.isSeparator ?? false } @@ -146,8 +147,8 @@ PopupWindow { id: text Layout.fillWidth: true color: (modelData?.enabled - ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOutline - text: modelData?.text ?? "" + ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant + text: modelData?.text !== "" ? modelData?.text : "..." font.pointSize: Style.fontSizeS * scaling verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap