From 10126b37d2e4655e17a2ea25b10801d8f9186f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 9 Mar 2015 14:51:33 +0100 Subject: Cocoa: Correct mouse event forwarding for popups We need to track the active popup globally, having parent windows track child popups is not sufficient since there may be one or more intermediate windows in between the event receiving window and popup window. Add API to QOCocoaIntegration for tracking the global popup window and use it instead of the per-window tracking. Make sure to only close popups on clicks outside the popup only. Add code to QNSView::handleMouseEvent that redirects mouse events to the active popup. Add manual test. Change-Id: Ia3e3fd42d8fddf5c69f0c6879b333ca544521f61 Task-number: QTBUG-43464 Task-number: QTBUG-31937 Reviewed-by: Gabriel de Dietrich --- tests/manual/cocoa/popups/main.cpp | 152 +++++++++++++++++++++++++++++++++++ tests/manual/cocoa/popups/popups.pro | 4 + 2 files changed, 156 insertions(+) create mode 100644 tests/manual/cocoa/popups/main.cpp create mode 100644 tests/manual/cocoa/popups/popups.pro (limited to 'tests/manual/cocoa') diff --git a/tests/manual/cocoa/popups/main.cpp b/tests/manual/cocoa/popups/main.cpp new file mode 100644 index 0000000000..46249d6772 --- /dev/null +++ b/tests/manual/cocoa/popups/main.cpp @@ -0,0 +1,152 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +class Window : public QWidget +{ + Q_OBJECT + +public: + Window(); + +public slots: + void triggered(QAction*); + void clean(); + void showPoppWindow(); + +private: + QLabel *explanation; + QToolButton *toolButton; + QMenu *menu; + QLineEdit *echo; + QComboBox *comboBox; + QPushButton *pushButton; +}; + +Window::Window() +{ + QGroupBox* group = new QGroupBox(tr("test the popup")); + + explanation = new QLabel( + "This test is used to verify that popup windows will be closed " + "as expected. This includes when clicking outside the popup or moving the " + "parent window. Tested popups include context menus, combo box popups, tooltips " + "and QWindow with Qt::Popup set." + ); + explanation->setWordWrap(true); + explanation->setToolTip("I'm a tool tip!"); + + menu = new QMenu(group); + menu->addAction(tr("line one")); + menu->addAction(tr("line two")); + menu->addAction(tr("line three")); + menu->addAction(tr("line four")); + menu->addAction(tr("line five")); + + QMenu *subMenu1 = new QMenu(); + subMenu1->addAction("1"); + subMenu1->addAction("2"); + subMenu1->addAction("3"); + menu->addMenu(subMenu1); + + QMenu *subMenu2 = new QMenu(); + subMenu2->addAction("2 1"); + subMenu2->addAction("2 2"); + subMenu2->addAction("2 3"); + menu->addMenu(subMenu2); + + toolButton = new QToolButton(group); + toolButton->setMenu(menu); + toolButton->setPopupMode( QToolButton::MenuButtonPopup ); + toolButton->setText("select me"); + + echo = new QLineEdit(group); + echo->setPlaceholderText("not triggered"); + + connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(triggered(QAction*))); + connect(menu, SIGNAL(aboutToShow()), this, SLOT(clean())); + + comboBox = new QComboBox(); + comboBox->addItem("Item 1"); + comboBox->addItem("Item 2"); + comboBox->addItem("Item 3"); + + pushButton = new QPushButton("Show popup window"); + connect(pushButton, SIGNAL(clicked()), this, SLOT(showPoppWindow())); + + QVBoxLayout* layout = new QVBoxLayout; + layout->addWidget(explanation); + layout->addWidget(toolButton); + layout->addWidget(echo); + layout->addWidget(comboBox); + layout->addWidget(pushButton); + + group ->setLayout(layout); + setLayout(layout); + setWindowTitle(tr("Popup Window Testing")); +} + +void Window::clean() +{ + echo->setText(""); +} + +void Window::showPoppWindow() +{ + QWindow *window = new QWindow(); + window->setTransientParent(this->windowHandle()); + window->setPosition(this->pos()); + window->setWidth(100); + window->setHeight(100); + window->setFlags(Qt::Window | Qt::Popup); + window->show(); +} + +void Window::triggered(QAction* act) +{ + if (!act) + return; + echo->setText(act->text()); +} + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + Window window; + window.show(); + return app.exec(); +} + +#include "main.moc" diff --git a/tests/manual/cocoa/popups/popups.pro b/tests/manual/cocoa/popups/popups.pro new file mode 100644 index 0000000000..d0a3d44171 --- /dev/null +++ b/tests/manual/cocoa/popups/popups.pro @@ -0,0 +1,4 @@ +QT += widgets + +SOURCES = main.cpp +CONFIG -= app_bundle -- cgit v1.2.3