diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-08-26 16:59:25 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-10-12 01:53:42 +0200 |
commit | dbf6e2db3bb724669b60fdd22221ed023ec1d739 (patch) | |
tree | 87faf82d4729dae8a6640f82fbfc737d64b03cde /src/widgets/widgets | |
parent | cdadd1bdb3f0137659f0f82b06628d0b20b858e3 (diff) |
QComboBox: remove dead code
We used to explicitly fade out combobox popups on macOS, but even the
cocoa platform plugin no longer implements a fadeWindow function.
Pick-to: 6.4
Change-Id: I5cd61da2c755ec0f312c451f0ea966aa48399385
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index e754d02f2a..d4a33c5dc0 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2837,30 +2837,11 @@ void QComboBox::hidePopup() } } - // Fade out. - bool needFade = style()->styleHint(QStyle::SH_Menu_FadeOutOnHide); - bool didFade = false; - if (needFade) { -#if defined(Q_OS_MAC) - QPlatformNativeInterface *platformNativeInterface = QGuiApplication::platformNativeInterface(); - int at = platformNativeInterface->metaObject()->indexOfMethod("fadeWindow()"); - if (at != -1) { - QMetaMethod windowFade = platformNativeInterface->metaObject()->method(at); - windowFade.invoke(platformNativeInterface, Q_ARG(QWindow *, d->container->windowHandle())); - didFade = true; - } - -#endif // Q_OS_MAC - // Other platform implementations welcome :-) - } containerBlocker.unblock(); viewBlocker.unblock(); modelBlocker.unblock(); - - if (!didFade) #endif // QT_CONFIG(effects) - // Fade should implicitly hide as well ;-) - d->container->hide(); + d->container->hide(); } #ifdef QT_KEYPAD_NAVIGATION if (QApplicationPrivate::keypadNavigationEnabled() && isEditable() && hasFocus()) |