Menu: Add aboutToShow, aboutToHide signals

These do the same as for QMenu, and are emitted
right before the pop-up is shown or hidden. On
Mac, these signals are emitted by the QPA plugin
and relayed by QQuickMenu.

Task-number: QTBUG-40576
Change-Id: I59113d8d9cc8c5b3140f4f552772d33dd0b6e138
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index ca266466..83411bcf 100644
--- a/tests/auto/controls/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -65,6 +65,18 @@ TestCase {
         signalName: "triggered"
     }
 
+    SignalSpy {
+        id: aboutToShowSpy
+        target: testcase.menu
+        signalName: "aboutToShow"
+    }
+
+    SignalSpy {
+        id: aboutToHideSpy
+        target: testcase.menu
+        signalName: "aboutToHide"
+    }
+
     Component {
         id: creationComponent
         Menu {
@@ -82,6 +94,8 @@ TestCase {
     function cleanup() {
         menuSpy.clear()
         menuItemSpy.clear()
+        aboutToShowSpy.clear()
+        aboutToHideSpy.clear()
         if (menu !== 0)
             menu.destroy()
     }
@@ -218,4 +232,20 @@ TestCase {
                 compare(item.text, "Item " + i)
         }
     }
+
+    function test_popupSignals() {
+        if (Qt.platform.os === "osx") {
+            // On Mac the popup() function blocks. The signals are still
+            // emitted by the QPA plugin and the relayed by QQuickMenu.
+            return;
+        }
+        menu.__popup(Qt.rect(50, 50, 20, 20))
+        wait(100) // Give it a chance to actually pop-up
+        compare(aboutToShowSpy.count, 1)
+        compare(aboutToHideSpy.count, 0)
+        aboutToShowSpy.clear()
+        menu.__dismissMenu()
+        compare(aboutToShowSpy.count, 0)
+        compare(aboutToHideSpy.count, 1)
+    }
 }