git.iko.soy/unity8
on xenial help sign in
Re-enable tooltips and tests.
adde39eAndrea Azzarone
qml/Launcher/LauncherPanel.qml+2−3
compare with xenial
unifiedsplit
@@ -33,7 +33,7 @@ Rectangle {
33 property bool dragging: false
33 property bool dragging: false
34 property bool moving: launcherListView.moving || launcherListView.flicking
34 property bool moving: launcherListView.moving || launcherListView.flicking
35 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
35 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
36− || mouseEventEater.containsMouse || dashItem.hovered
36+ || dndArea.containsMouse || dashItem.hovered
37 property int highlightIndex: -2
37 property int highlightIndex: -2
38 property bool shortcutHintsShown: false
38 property bool shortcutHintsShown: false
39
39
@@ -72,7 +72,6 @@ Rectangle {
72 anchors.fill: parent
72 anchors.fill: parent
73 acceptedButtons: Qt.AllButtons
73 acceptedButtons: Qt.AllButtons
74 onWheel: wheel.accepted = true;
74 onWheel: wheel.accepted = true;
75− hoverEnabled: true
76 }
75 }
77
76
78 Column {
77 Column {
@@ -401,7 +400,7 @@ Rectangle {
401 id: dndArea
400 id: dndArea
402 objectName: "dndArea"
401 objectName: "dndArea"
403 acceptedButtons: Qt.LeftButton | Qt.RightButton
402 acceptedButtons: Qt.LeftButton | Qt.RightButton
404− //hoverEnabled: true
403+ hoverEnabled: true
405 anchors {
404 anchors {
406 fill: parent
405 fill: parent
407 topMargin: launcherListView.topMargin
406 topMargin: launcherListView.topMargin
tests/qmltests/Launcher/tst_Launcher.qml+2−2
@@ -1354,7 +1354,7 @@ Rectangle {
1354 tryCompare(clickThroughSpy, "count", 0);
1354 tryCompare(clickThroughSpy, "count", 0);
1355 }
1355 }
1356
1356
1357− /*function test_tooltip() {
1357+ function test_tooltip() {
1358 launcher.lockedVisible = true;
1358 launcher.lockedVisible = true;
1359 revealByEdgePush();
1359 revealByEdgePush();
1360
1360
@@ -1441,6 +1441,6 @@ Rectangle {
1441 mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
1441 mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
1442 tryCompare(tooltipShape, "visible", true);
1442 tryCompare(tooltipShape, "visible", true);
1443 tryCompare(tooltipShape, "opacity", .95);
1443 tryCompare(tooltipShape, "opacity", .95);
1444− }*/
1444+ }
1445 }
1445 }
1446}
1446}