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

TrayMenu: if menu entry does not define a text, shows "..."

Browse source
This commit is contained in:
quadbyte 2025-08-18 16:33:56 -04:00
parent 50cf2ed5e1
commit 764638a329
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/Bar/Bluetooth.qml
View file

@ -14,7 +14,7 @@ NIconButton {
sizeMultiplier: 0.8 sizeMultiplier: 0.8
visible: bluetoothEnabled visible: bluetoothEnabled
colorBg: Color.mSurfaceVariant colorBg: Color.mSurfaceVariant
colorFg: Color.mOnSurface colorFg: Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

5
Modules/Bar/TrayMenu.qml
View file

@ -127,6 +127,7 @@ PopupWindow {
NDivider { NDivider {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width - (Style.marginM * scaling * 2) width: parent.width - (Style.marginM * scaling * 2)
color: Color.mPrimary
visible: modelData?.isSeparator ?? false visible: modelData?.isSeparator ?? false
} }
@ -146,8 +147,8 @@ PopupWindow {
id: text id: text
Layout.fillWidth: true Layout.fillWidth: true
color: (modelData?.enabled color: (modelData?.enabled
?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOutline ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
text: modelData?.text ?? "" text: modelData?.text !== "" ? modelData?.text : "..."
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap wrapMode: Text.WordWrap