status-im
/
status-qml
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(Popups/StatusMenuItemDelegate) adding checks to avoid undefined errors

This commit is contained in:
Alexandra Betouni 2021-10-22 20:32:30 +03:00 committed by r4bbit.eth
parent 1452748331
commit 98dab4ff82
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/StatusQ/Popups/StatusMenuItemDelegate.qml
View File

@ -33,27 +33,26 @@ MenuItem {
StatusIcon { StatusIcon {
anchors.centerIn: parent anchors.centerIn: parent
width: { width: {
let width = statusPopupMenuItem.action.icon.width || let width = statusPopupMenuItem.action && statusPopupMenuItem.action.icon.width ||
statusPopupMenuItem.action.iconSettings.width statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.width
return !!width ? width : 18 return !!width ? width : 18
} }
rotation: statusPopupMenuItem.action.iconRotation rotation: !!statusPopupMenuItem.action.iconRotation ? statusPopupMenuItem.action.iconRotation : 0
icon: { icon: {
if (statusPopupMenuItem.subMenu && !!statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex] && if (statusPopupMenuItem.subMenu && !!statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex] &&
statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon.toString() !== "") { statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon.toString() !== "") {
return statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon; return statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon;
} else if (!!statusPopupMenuItem.action && statusPopupMenuItem.action.icon.name !== "") { } else if (!!statusPopupMenuItem.action && statusPopupMenuItem.action.icon.name !== "") {
return statusPopupMenuItem.action.icon.name; return statusPopupMenuItem.action.icon.name;
} else if (statusPopupMenuItem.action.iconSettings.name !== "") { } else if (!!statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.name !== "") {
return statusPopupMenuItem.action.iconSettings.name; return statusPopupMenuItem.action.iconSettings.name;
} else { } else {
return ""; return "";
} }
} }
color: { color: {
let c = statusPopupMenuItem.action.iconSettings.color || let c = !!statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.color ||
statusPopupMenuItem.action.icon.color !!statusPopupMenuItem.action && statusPopupMenuItem.action.icon.color
if (!Qt.colorEqual(c, "transparent")) { if (!Qt.colorEqual(c, "transparent")) {
return c return c