nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: more weird async null warnings

Browse source
This commit is contained in:
2 * r + 2 * t 2026-06-07 19:16:37 +10:00
parent cf7fc4aac5
commit 6f51a1a561
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/controls/Menu.qml
View file

@ -116,7 +116,7 @@ MouseArea {
required property int index required property int index
required property MenuItem modelData required property MenuItem modelData
readonly property bool active: modelData === root.active readonly property bool active: modelData === root?.active
Layout.fillWidth: true Layout.fillWidth: true
implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.medium * 2 implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.medium * 2
@ -125,8 +125,8 @@ MouseArea {
radius: active ? Tokens.rounding.medium : Tokens.rounding.extraSmall radius: active ? Tokens.rounding.medium : Tokens.rounding.extraSmall
topLeftRadius: index === 0 ? Tokens.rounding.medium : radius topLeftRadius: index === 0 ? Tokens.rounding.medium : radius
topRightRadius: index === 0 ? Tokens.rounding.medium : radius topRightRadius: index === 0 ? Tokens.rounding.medium : radius
bottomLeftRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius bottomLeftRadius: index === repeater?.count - 1 ? Tokens.rounding.medium : radius
bottomRightRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius bottomRightRadius: index === repeater?.count - 1 ? Tokens.rounding.medium : radius
color: Qt.alpha(Colours.palette.m3tertiaryContainer, active ? 1 : 0) color: Qt.alpha(Colours.palette.m3tertiaryContainer, active ? 1 : 0)
@ -159,21 +159,21 @@ MouseArea {
MaterialIcon { MaterialIcon {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: item.modelData.icon text: item.modelData?.icon ?? ""
color: item.active ? Colours.palette.m3onTertiaryContainer : Colours.palette.m3onSurfaceVariant color: item.active ? Colours.palette.m3onTertiaryContainer : Colours.palette.m3onSurfaceVariant
} }
StyledText { StyledText {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true Layout.fillWidth: true
text: item.modelData.text text: item.modelData?.text ?? ""
color: item.active ? Colours.palette.m3onTertiaryContainer : Colours.palette.m3onSurface color: item.active ? Colours.palette.m3onTertiaryContainer : Colours.palette.m3onSurface
} }
Loader { Loader {
asynchronous: true asynchronous: true
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
active: item.modelData.trailingIcon.length > 0 active: item.modelData?.trailingIcon.length > 0
visible: active visible: active
sourceComponent: MaterialIcon { sourceComponent: MaterialIcon {