git.iko.soy/unity8
on xenial help sign in
Refactor and simplify tooltip layout logic.
f193095Andrea Azzarone
qml/Launcher/LauncherPanel.qml+23−41
compare with xenial
unifiedsplit
@@ -835,11 +835,12 @@ Rectangle {
835 UbuntuShape {
835 UbuntuShape {
836 id: tooltipShape
836 id: tooltipShape
837 objectName: "tooltipShape"
837 objectName: "tooltipShape"
838− anchors.fill: tooltip
838+
839− opacity: tooltipShownState.active ? 0.95 : 0
840− visible: opacity > 0
841 rotation: root.rotation
839 rotation: root.rotation
842 aspect: UbuntuShape.Flat
840 aspect: UbuntuShape.Flat
841+ color: theme.palette.normal.background
842+ opacity: tooltipShownState.active ? 0.95 : 0
843+ visible: opacity > 0
843
844
844 Behavior on opacity {
845 Behavior on opacity {
845 UbuntuNumberAnimation {
846 UbuntuNumberAnimation {
@@ -847,9 +848,14 @@ Rectangle {
847 }
848 }
848 }
849 }
849
850
850− source: ShaderEffectSource {
851+ width: tooltipLabel.implicitWidth + units.gu(4)
851− sourceItem: tooltip
852+ height: tooltipLabel.implicitHeight + units.gu(2)
852− hideSource: true
853+ y: itemCenter - (height / 2)
854+
855+ anchors {
856+ left: root.inverted ? undefined : parent.right
857+ right: root.inverted ? parent.left : undefined
858+ margins: units.gu(1)
853 }
859 }
854
860
855 Image {
861 Image {
@@ -857,56 +863,32 @@ Rectangle {
857 right: parent.left
863 right: parent.left
858 rightMargin: -units.dp(4)
864 rightMargin: -units.dp(4)
859 verticalCenter: parent.verticalCenter
865 verticalCenter: parent.verticalCenter
860− verticalCenterOffset: -tooltip.offset * (root.inverted ? -1 : 1)
861 }
866 }
862 height: units.gu(1)
867 height: units.gu(1)
863 width: units.gu(2)
868 width: units.gu(2)
864 source: "graphics/quicklist_tooltip.png"
869 source: "graphics/quicklist_tooltip.png"
865 rotation: 90
870 rotation: 90
866 }
871 }
867− }
868−
869− Rectangle {
870− id: tooltip
871− objectName: "tooltip"
872
872
873+ Label {
874+ id: tooltipLabel
875+ anchors.centerIn: parent
876+ verticalAlignment: Label.AlignVCenter
873− color: theme.palette.normal.background
877+ color: theme.palette.normal.backgroundText
874− visible: tooltipShape.visible
875−
876− width: tooltipLabel.contentWidth + units.gu(4)
877− height: tooltipLabel.contentHeight + units.gu(2)
878−
879− y: itemCenter - (height / 2) + offset
880− rotation: root.rotation
881−
882− anchors {
883− left: root.inverted ? undefined : parent.right
884− right: root.inverted ? parent.left : undefined
885− margins: units.gu(1)
878+ anchors.margins: units.gu(10)
886 }
879 }
887
880
888 property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
881 property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
889−
890 property int itemCenter
882 property int itemCenter
891− property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
892− itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
893
883
894 // This avoids artifacts on fade-out animation
884 // This avoids artifacts on fade-out animation
895 onHoveredItemChanged : {
885 onHoveredItemChanged : {
896 if (hoveredItem != null && !root.moving) {
886 if (hoveredItem != null && !root.moving) {
897 itemCenter = root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset
887 itemCenter = root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset
898− tooltipLabel.text = tooltip.hoveredItem.name
888+ tooltipLabel.text = tooltipShape.hoveredItem.name
899 }
889 }
900 }
890 }
901
891
902− Label {
903− id: tooltipLabel
904− height: parent.height
905− anchors.centerIn: parent
906− verticalAlignment: Label.AlignVCenter
907− color: theme.palette.normal.backgroundText
908− }
909−
910 DSM.StateMachine {
892 DSM.StateMachine {
911 id: tooltipStateMachine
893 id: tooltipStateMachine
912 initialState: tooltipHiddenState
894 initialState: tooltipHiddenState
@@ -917,9 +899,9 @@ Rectangle {
917
899
918 DSM.SignalTransition {
900 DSM.SignalTransition {
919 targetState: tooltipShownState
901 targetState: tooltipShownState
920− signal: tooltip.hoveredItemChanged
902+ signal: tooltipShape.hoveredItemChanged
921 // !dndArea.pressed allows us to filter out touch input events
903 // !dndArea.pressed allows us to filter out touch input events
922− guard: tooltip.hoveredItem != null && !dndArea.pressed && !root.moving
904+ guard: tooltipShape.hoveredItem != null && !dndArea.pressed && !root.moving
923 }
905 }
924 }
906 }
925
907
@@ -928,8 +910,8 @@ Rectangle {
928
910
929 DSM.SignalTransition {
911 DSM.SignalTransition {
930 targetState: tooltipHiddenState
912 targetState: tooltipHiddenState
931− signal: tooltip.hoveredItemChanged
913+ signal: tooltipShape.hoveredItemChanged
932− guard: tooltip.hoveredItem == null
914+ guard: tooltipShape.hoveredItem == null
933 }
915 }
934
916
935 DSM.SignalTransition {
917 DSM.SignalTransition {