git.iko.soy/unity8
on xenial help sign in
Re-enable tooltips and tests.
commitadde39ed79d7a7dedf0090cc2f79f69d094b0243 authorAndrea Azzarone <azzaronea@gmail.com> dateThu 20 Oct 2016, 11:24 (10 years ago) parent3c5d3f9
2 files changed+4−5
compare with xenial
unifiedsplit
qml/Launcher/LauncherPanel.qml+2−3 tests/qmltests/Launcher/tst_Launcher.qml+2−2
qml/Launcher/LauncherPanel.qml+2−3
@@ -33,7 +33,7 @@ Rectangle {
3333 property bool dragging: false
3434 property bool moving: launcherListView.moving || launcherListView.flicking
3535 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
36− || mouseEventEater.containsMouse || dashItem.hovered
36+ || dndArea.containsMouse || dashItem.hovered
3737 property int highlightIndex: -2
3838 property bool shortcutHintsShown: false
3939
@@ -72,7 +72,6 @@ Rectangle {
7272 anchors.fill: parent
7373 acceptedButtons: Qt.AllButtons
7474 onWheel: wheel.accepted = true;
75− hoverEnabled: true
7675 }
7776
7877 Column {
@@ -401,7 +400,7 @@ Rectangle {
401400 id: dndArea
402401 objectName: "dndArea"
403402 acceptedButtons: Qt.LeftButton | Qt.RightButton
404− //hoverEnabled: true
403+ hoverEnabled: true
405404 anchors {
406405 fill: parent
407406 topMargin: launcherListView.topMargin
tests/qmltests/Launcher/tst_Launcher.qml+2−2
@@ -1354,7 +1354,7 @@ Rectangle {
13541354 tryCompare(clickThroughSpy, "count", 0);
13551355 }
13561356
1357− /*function test_tooltip() {
1357+ function test_tooltip() {
13581358 launcher.lockedVisible = true;
13591359 revealByEdgePush();
13601360
@@ -1441,6 +1441,6 @@ Rectangle {
14411441 mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
14421442 tryCompare(tooltipShape, "visible", true);
14431443 tryCompare(tooltipShape, "opacity", .95);
1444− }*/
1444+ }
14451445 }
14461446}