fixed some undefined warnings

This commit is contained in:
Pico
2025-11-14 01:08:47 +03:00
parent bda5422ccc
commit 2362c2ab3f
@@ -48,11 +48,11 @@ ComboBox {
Loader { Loader {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
active: root.buttonIcon.length > 0 || (root.currentIndex >= 0 && root.model[root.currentIndex]?.icon) active: root.buttonIcon.length > 0 || (root.currentIndex >= 0 && typeof root.model[root.currentIndex] === 'object' && root.model[root.currentIndex]?.icon)
visible: active visible: active
sourceComponent: MaterialSymbol { sourceComponent: MaterialSymbol {
text: { text: {
if (root.currentIndex >= 0 && root.model[root.currentIndex]?.icon) { if (root.currentIndex >= 0 && typeof root.model[root.currentIndex] === 'object' && root.model[root.currentIndex]?.icon) {
return root.model[root.currentIndex].icon; return root.model[root.currentIndex].icon;
} }
return root.buttonIcon; return root.buttonIcon;
@@ -99,7 +99,7 @@ ComboBox {
Loader { Loader {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: Appearance.font.pixelSize.larger Layout.preferredHeight: Appearance.font.pixelSize.larger
active: itemDelegate.model.icon && itemDelegate.model.icon.length > 0 active: typeof itemDelegate.model === 'object' && itemDelegate.model?.icon?.length > 0
visible: active visible: active
sourceComponent: Item { sourceComponent: Item {
implicitWidth: icon.implicitWidth implicitWidth: icon.implicitWidth
@@ -107,7 +107,7 @@ ComboBox {
MaterialSymbol { MaterialSymbol {
id: icon id: icon
anchors.centerIn: parent anchors.centerIn: parent
text: itemDelegate.model.icon text: itemDelegate.model?.icon ?? ""
iconSize: Appearance.font.pixelSize.larger iconSize: Appearance.font.pixelSize.larger
color: root.currentIndex === itemDelegate.index ? Appearance.colors.colOnPrimary : Appearance.colors.colOnSecondaryContainer color: root.currentIndex === itemDelegate.index ? Appearance.colors.colOnPrimary : Appearance.colors.colOnSecondaryContainer
} }