Fix some TypeErrors in DefaultToolTip

This commit is contained in:
Sebastian Kügler 2014-01-15 12:50:18 +01:00
parent 0a3a236dfb
commit ca76aa29f8

View File

@ -39,7 +39,7 @@ Row {
Item { Item {
id: imageContainer id: imageContainer
visible: toolTip.image || toolTip.icon visible: toolTip != null && (toolTip.image != undefined || toolTip.icon != undefined)
width: Math.max(tooltipImage.width, tooltipIcon.width) width: Math.max(tooltipImage.width, tooltipIcon.width)
height: Math.max(tooltipImage.height, tooltipIcon.height) height: Math.max(tooltipImage.height, tooltipIcon.height)
@ -50,9 +50,9 @@ Row {
PlasmaCore.IconItem { PlasmaCore.IconItem {
id: tooltipIcon id: tooltipIcon
width: toolTip.icon != null ? theme.iconSizes.desktop : 0 width: toolTip != undefined && toolTip.icon != null ? theme.iconSizes.desktop : 0
height: width height: width
source: toolTip.icon != null ? toolTip.icon : "" source: toolTip != undefined && toolTip.icon != null ? toolTip.icon : ""
anchors { anchors {
leftMargin: width != 0 ? _s : 0 leftMargin: width != 0 ? _s : 0
} }