git.iko.soy/unity8
on xenial help sign in
Avoid type conversion.
5d757f9Andrea Azzarone
qml/Launcher/LauncherPanel.qml+4−4
compare with xenial
unifiedsplit
@@ -846,9 +846,9 @@ Rectangle {
846 }
846 }
847
847
848 readonly property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
848 readonly property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
849− readonly property int itemCenter: hoveredItem ? root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset : 0
849+ readonly property int itemCenter: !hoveredItem ? 0 : root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset
850
850
851− text: hoveredItem ? hoveredItem.name : ""
851+ text: !hoveredItem ? "" : hoveredItem.name
852 }
852 }
853
853
854 DSM.StateMachine {
854 DSM.StateMachine {
@@ -863,7 +863,7 @@ Rectangle {
863 targetState: tooltipShownState
863 targetState: tooltipShownState
864 signal: tooltipShape.hoveredItemChanged
864 signal: tooltipShape.hoveredItemChanged
865 // !dndArea.pressed allows us to filter out touch input events
865 // !dndArea.pressed allows us to filter out touch input events
866− guard: tooltipShape.hoveredItem != null && !dndArea.pressed && !root.moving
866+ guard: tooltipShape.hoveredItem !== null && !dndArea.pressed && !root.moving
867 }
867 }
868 }
868 }
869
869
@@ -873,7 +873,7 @@ Rectangle {
873 DSM.SignalTransition {
873 DSM.SignalTransition {
874 targetState: tooltipHiddenState
874 targetState: tooltipHiddenState
875 signal: tooltipShape.hoveredItemChanged
875 signal: tooltipShape.hoveredItemChanged
876− guard: tooltipShape.hoveredItem == null
876+ guard: tooltipShape.hoveredItem === null
877 }
877 }
878
878
879 DSM.SignalTransition {
879 DSM.SignalTransition {