1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Simplify and fix issues with QMenuPrivate::moveWidgetToPlatformItem

Browse Source 
View embedding when QWidget is involved is a bit finicky. This change
breaks down the steps needed to embed it into an NSMenu item, and
simplifies the process by not relying on a container widget.

The main issue is that QCocoaWindow::recreateWindowIfNeeded() will
potentially create an NSWindow for the embedded view, resulting in
a stray view. To prevent this we set the Qt::SubWindow flag on the
window, but QWidget tends to reset this flag when the widget doesn't
have a parent, so we need to be careful about which order we do the
setup.

Change-Id: I505f7c0a2d8e4350511fdb01a5e9b9c623a40a41
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit c30d05e794e49d69cbc981ae2ff21e5713c5a81f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2020-12-11 13:07:24 +01:00 committed by Qt Cherry-pick Bot
parent fc33f71f81
commit 72bf3234e4
2 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/widgets/qmenu.cpp
View File

@ -3588,19 +3588,8 @@ void QMenu::actionEvent(QActionEvent *e)
if (e->action() == d->currentAction)
d->currentAction = nullptr;
if (QWidgetAction *wa = qobject_cast<QWidgetAction *>(e->action())) {
if (QWidget *widget = d->widgetItems.value(wa)) {
#ifdef Q_OS_MACOS
QWidget *p = widget->parentWidget();
if (p != this) {
// This widget was reparented into a container widget
// (see QMenuPrivate::moveWidgetToPlatformItem).
// Reset the parent and delete the native widget.
widget->setParent(this);
p->deleteLater();
}
#endif
if (QWidget *widget = d->widgetItems.value(wa))
wa->releaseWidget(widget);
}
}
d->widgetItems.remove(static_cast<QAction *>(e->action()));
}

65
src/widgets/widgets/qmenu_mac.mm
View File

@ -62,22 +62,6 @@ QT_BEGIN_NAMESPACE
#if QT_CONFIG(menu)
namespace {
// TODO use QtMacExtras copy of this function when available.
inline QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePlatformFunction(const QByteArray &functionName)
{
QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
QPlatformNativeInterface::NativeResourceForIntegrationFunction function =
nativeInterface->nativeResourceFunctionForIntegration(functionName);
if (Q_UNLIKELY(!function))
qWarning("Qt could not resolve function %s from "
"QGuiApplication::platformNativeInterface()->nativeResourceFunctionForIntegration()",
functionName.constData());
return function;
}
} //namespsace
/*!
\fn NSMenu *QMenu::toNSMenu()
\since 5.2
@ -113,27 +97,40 @@ void QMenu::setAsDockMenu()
void QMenuPrivate::moveWidgetToPlatformItem(QWidget *widget, QPlatformMenuItem* item)
{
auto *container = new QWidget;
container->setAttribute(Qt::WA_TranslucentBackground);
container->setAttribute(Qt::WA_QuitOnClose, false);
QObject::connect(platformMenu, SIGNAL(destroyed()), container, SLOT(deleteLater()));
container->resize(widget->sizeHint());
widget->setParent(container);
widget->setVisible(true);
// Hide the widget before we mess with it
widget->hide();
NSView *containerView = reinterpret_cast<NSView*>(container->winId());
QWindow *containerWindow = container->windowHandle();
Qt::WindowFlags wf = containerWindow->flags();
containerWindow->setFlags(wf | Qt::SubWindow);
[(NSView *)widget->winId() setAutoresizingMask:NSViewWidthSizable];
// Move out of QMenu, since this widget will live in the native menu item
widget->setParent(nullptr);
if (QPlatformNativeInterface::NativeResourceForIntegrationFunction function = resolvePlatformFunction("setEmbeddedInForeignView")) {
typedef void (*SetEmbeddedInForeignViewFunction)(QPlatformWindow *window, bool embedded);
reinterpret_cast<SetEmbeddedInForeignViewFunction>(function)(containerWindow->handle(), true);
}
// Make sure the widget doesn't prevent quitting the application,
// just because it's a parent-less (top level) window.
widget->setAttribute(Qt::WA_QuitOnClose, false);
item->setNativeContents((WId)containerView);
container->show();
// And that it blends nicely with the native menu background
widget->setAttribute(Qt::WA_TranslucentBackground);
// Trigger creation of the backing QWindow, the platform window, and its
// underlying NSView and NSWindow. At this point the widget is still hidden,
// so the corresponding NSWindow that is created is not shown.
widget->setAttribute(Qt::WA_NativeWindow);
QWindow *widgetWindow = widget->windowHandle();
widgetWindow->create();
// Inform the window that it's actually a sub-window. This
// ensures that we dispose of the NSWindow when the widget is
// finally shown. We need to do this on a QWindow level, as
// QWidget will ignore the flag if there is no parentWidget().
// And we need to do it after creating the platform window, as
// QWidget will overwrite the window flags during creation.
widgetWindow->setFlag(Qt::SubWindow);
// Finally, we can associate the underlying NSView with the menu item,
// and show it. This will dispose of the created NSWindow, due to
// the Qt::SubWindow flag above. The widget will not actually be
// visible until it's re-parented into the NSMenu hierarchy.
item->setNativeContents(WId(widgetWindow->winId()));
widget->show();
}
#endif // QT_CONFIG(menu)