qt 6.6.0 clean

tests/auto/gui/kernel/qwindow/BLACKLIST

@@ -23,3 +23,8 @@ android
 android
 [modalWindowModallity]
 android
+[enterLeaveOnWindowShowHide]
+windows-10
+windows-11
+android
+rhel

tests/auto/gui/kernel/qwindow/CMakeLists.txt

@@ -14,8 +14,9 @@ qt_internal_add_test(tst_qwindow
         Qt::GuiPrivate
 )
 
-if(APPLE OR WIN32)
+if(APPLE OR WIN32 OR QT_FEATURE_xcb)
     qt_internal_add_test(tst_foreignwindow
+        LOWDPI
         SOURCES
             tst_foreignwindow.cpp
         LIBRARIES
@@ -28,6 +29,10 @@ if(APPLE OR WIN32)
         set_source_files_properties(tst_foreignwindow.cpp PROPERTIES LANGUAGE OBJCXX)
         set_property(TARGET tst_foreignwindow PROPERTY PROPERTY MACOSX_BUNDLE TRUE)
     endif()
+
+    if(QT_FEATURE_xcb)
+        target_link_libraries(tst_foreignwindow PRIVATE XCB::XCB)
+    endif()
 endif()
 
 ## Scopes:

tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp

@@ -7,114 +7,7 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 
-#if defined(Q_OS_MACOS)
-#  include <AppKit/AppKit.h>
-#elif defined(Q_OS_WIN)
-#  include <winuser.h>
-#endif
-
-Q_LOGGING_CATEGORY(lcTests, "qt.gui.tests")
-
-class NativeWindow
-{
-    Q_DISABLE_COPY(NativeWindow)
-public:
-    NativeWindow();
-    ~NativeWindow();
-
-    operator WId() const { return reinterpret_cast<WId>(m_handle); }
-
-    void setGeometry(const QRect &rect);
-    QRect geometry() const;
-
-private:
-#if defined(Q_OS_MACOS)
-    NSView *m_handle = nullptr;
-#elif defined(Q_OS_WIN)
-    HWND m_handle = nullptr;
-#endif
-};
-
-#if defined(Q_OS_MACOS)
-
-@interface View : NSView
-@end
-
-@implementation View
-- (instancetype)init
-{
-    if ((self = [super init])) {
-        qCDebug(lcTests) << "Initialized" << self;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    qCDebug(lcTests) << "Deallocating" << self;
-    [super dealloc];
-}
-@end
-
-NativeWindow::NativeWindow()
-    : m_handle([View new])
-{
-}
-
-NativeWindow::~NativeWindow()
-{
-    [m_handle release];
-}
-
-void NativeWindow::setGeometry(const QRect &rect)
-{
-    m_handle.frame = QRectF(rect).toCGRect();
-}
-
-QRect NativeWindow::geometry() const
-{
-    return QRectF::fromCGRect(m_handle.frame).toRect();
-}
-
-#elif defined(Q_OS_WIN)
-
-NativeWindow::NativeWindow()
-{
-    static const LPCWSTR className = []{
-        WNDCLASS wc = {};
-        wc.lpfnWndProc = DefWindowProc;
-        wc.hInstance = GetModuleHandle(nullptr);
-        wc.lpszClassName = L"Native Window";
-        RegisterClass(&wc);
-        return wc.lpszClassName;
-    }();
-    m_handle = CreateWindowEx(0, className, nullptr, WS_POPUP,
-                CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                nullptr, nullptr, GetModuleHandle(nullptr), nullptr);
-}
-
-NativeWindow::~NativeWindow()
-{
-    DestroyWindow(m_handle);
-}
-
-void NativeWindow::setGeometry(const QRect &rect)
-{
-    MoveWindow(m_handle, rect.x(), rect.y(), rect.width(), rect.height(), false);
-}
-
-QRect NativeWindow::geometry() const
-{
-    WINDOWPLACEMENT wp;
-    wp.length = sizeof(WINDOWPLACEMENT);
-    if (GetWindowPlacement(m_handle, &wp)) {
-        RECT r = wp.rcNormalPosition;
-        return QRect(r.left, r.top, r.right - r.left, r.bottom - r.top);
-    }
-    return {};
-}
-
-#endif
+#include "../../../../shared/nativewindow.h"
 
 class tst_ForeignWindow: public QObject
 {
@@ -130,6 +23,8 @@ private slots:
 
     void fromWinId();
     void initialState();
+
+    void embedForeignWindow();
 };
 
 void tst_ForeignWindow::fromWinId()
@@ -165,6 +60,7 @@ void tst_ForeignWindow::initialState()
 
     const QRect initialGeometry(123, 456, 321, 654);
     nativeWindow.setGeometry(initialGeometry);
+    QTRY_COMPARE(nativeWindow.geometry(), initialGeometry);
 
     std::unique_ptr<QWindow> foreignWindow(QWindow::fromWinId(nativeWindow));
     QCOMPARE(nativeWindow.geometry(), initialGeometry);
@@ -174,5 +70,22 @@ void tst_ForeignWindow::initialState()
     QCOMPARE(foreignWindow->geometry(), initialGeometry);
 }
 
+void tst_ForeignWindow::embedForeignWindow()
+{
+    // A foreign window embedded into a Qt UI requires that the rest of Qt
+    // is to be able to treat the foreign child window as any other window
+    // that it can show, hide, stack, and move around.
+
+    QWindow parentWindow;
+
+    NativeWindow nativeWindow;
+    QVERIFY(nativeWindow);
+
+    // As a prerequisite to that, we must be able to reparent the foreign window
+    std::unique_ptr<QWindow> foreignWindow(QWindow::fromWinId(nativeWindow));
+    foreignWindow.release()->setParent(&parentWindow);
+    QTRY_COMPARE(nativeWindow.parentWinId(), parentWindow.winId());
+}
+
 #include <tst_foreignwindow.moc>
 QTEST_MAIN(tst_ForeignWindow)

tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

@@ -89,6 +89,10 @@ private slots:
     void qobject_castOnDestruction();
     void touchToMouseTranslationByPopup();
     void stateChangeSignal();
+#ifndef QT_NO_CURSOR
+    void enterLeaveOnWindowShowHide_data();
+    void enterLeaveOnWindowShowHide();
+#endif
 
 private:
     QPoint m_availableTopLeft;
@@ -2883,6 +2887,87 @@ void tst_QWindow::stateChangeSignal()
     CHECK_SIGNAL(Qt::WindowMinimized);
 }
 
+#ifndef QT_NO_CURSOR
+void tst_QWindow::enterLeaveOnWindowShowHide_data()
+{
+    QTest::addColumn<Qt::WindowType>("windowType");
+    QTest::addRow("dialog") << Qt::Dialog;
+    QTest::addRow("popup") << Qt::Popup;
+}
+
+/*!
+    Verify that we get enter and leave events if the window under the mouse
+    opens and closes a modal dialog or popup. QWindow might get multiple
+    events in a row, as the various QPA plugins need to use different techniques
+    to synthesize events if the native platform doesn't provide them for us.
+*/
+void tst_QWindow::enterLeaveOnWindowShowHide()
+{
+    if (isPlatformWayland())
+        QSKIP("Can't set cursor position and qWaitForWindowActive on Wayland");
+
+    QFETCH(Qt::WindowType, windowType);
+
+    class Window : public QWindow
+    {
+    public:
+        int numEnterEvents = 0;
+        int numLeaveEvents = 0;
+        QPoint enterPosition;
+    protected:
+        bool event(QEvent *e) override
+        {
+            switch (e->type()) {
+            case QEvent::Enter:
+                ++numEnterEvents;
+                enterPosition = static_cast<QEnterEvent*>(e)->position().toPoint();
+                break;
+            case QEvent::Leave:
+                ++numLeaveEvents;
+                break;
+            default:
+                break;
+            }
+            return QWindow::event(e);
+        }
+    };
+
+    int expectedEnter = 0;
+    int expectedLeave = 0;
+
+    Window window;
+    const QRect screenGeometry = window.screen()->availableGeometry();
+    const QPoint cursorPos = screenGeometry.topLeft() + QPoint(50, 50);
+    window.setGeometry(QRect(cursorPos - QPoint(50, 50), screenGeometry.size() / 4));
+    QCursor::setPos(cursorPos);
+
+    if (!QTest::qWaitFor([&]{ return window.geometry().contains(QCursor::pos()); }))
+        QSKIP("We can't move the cursor");
+
+    window.show();
+    window.requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+
+    ++expectedEnter;
+    QTRY_COMPARE_WITH_TIMEOUT(window.numEnterEvents, expectedEnter, 250);
+    QCOMPARE(window.enterPosition, window.mapFromGlobal(QCursor::pos()));
+
+    QWindow secondary;
+    secondary.setFlag(windowType);
+    secondary.setModality(Qt::WindowModal);
+    secondary.setTransientParent(&window);
+    secondary.setPosition(cursorPos + QPoint(50, 50));
+    secondary.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&secondary));
+    ++expectedLeave;
+    QTRY_VERIFY(window.numLeaveEvents >= expectedLeave);
+    secondary.close();
+    ++expectedEnter;
+    QTRY_VERIFY(window.numEnterEvents >= expectedEnter);
+    QCOMPARE(window.enterPosition, window.mapFromGlobal(QCursor::pos()));
+}
+#endif
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)