1 files changed, 21 insertions, 14 deletions

diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 0a5c52abe6..c1fb409380 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -79,6 +79,7 @@
 #include <private/qaction_p.h>
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformtheme.h>
+#include <private/qdesktopwidget_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -104,7 +105,7 @@ class QTornOffMenu : public QMenu
             Q_Q(QTornOffMenu);
             QSize size = menuSize;
             const QPoint p = (!initialized) ? causedMenu->pos() : q->pos();
-            QRect screen = popupGeometry(QApplication::desktop()->screenNumber(p));
+            QRect screen = popupGeometry(QDesktopWidgetPrivate::screenNumber(p));
             const int desktopFrame = q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q);
             const int titleBarHeight = q->style()->pixelMetric(QStyle::PM_TitleBarHeight, 0, q);
             if (scroll && (size.height() > screen.height() - titleBarHeight || size.width() > screen.width())) {
@@ -266,28 +267,28 @@ int QMenuPrivate::scrollerHeight() const
     return qMax(QApplication::globalStrut().height(), q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q));
 }
 
-//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
+//Windows and KDE allow menus to cover the taskbar, while GNOME and Mac don't
 QRect QMenuPrivate::popupGeometry() const
 {
     Q_Q(const QMenu);
     if (!tornoff && // Torn-off menus are different
             QGuiApplicationPrivate::platformTheme() &&
             QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool()) {
-        return QApplication::desktop()->screenGeometry(q);
+        return QDesktopWidgetPrivate::screenGeometry(q);
     } else {
-        return QApplication::desktop()->availableGeometry(q);
+        return QDesktopWidgetPrivate::availableGeometry(q);
     }
 }
 
-//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
+//Windows and KDE allow menus to cover the taskbar, while GNOME and Mac don't
 QRect QMenuPrivate::popupGeometry(int screen) const
 {
     if (!tornoff && // Torn-off menus are different
             QGuiApplicationPrivate::platformTheme() &&
             QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool()) {
-        return QApplication::desktop()->screenGeometry(screen);
+        return QDesktopWidgetPrivate::screenGeometry(screen);
     } else {
-        return QApplication::desktop()->availableGeometry(screen);
+        return QDesktopWidgetPrivate::availableGeometry(screen);
     }
 }
 
@@ -306,6 +307,11 @@ QVector<QPointer<QWidget> > QMenuPrivate::calcCausedStack() const
     return ret;
 }
 
+bool QMenuPrivate::isContextMenu() const
+{
+    return qobject_cast<const QMenuBar *>(topCausedWidget()) == nullptr;
+}
+
 void QMenuPrivate::updateActionRects() const
 {
     updateActionRects(popupGeometry());
@@ -360,6 +366,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
     //calculate size
     QFontMetrics qfm = q->fontMetrics();
     bool previousWasSeparator = true; // this is true to allow removing the leading separators
+    const bool contextMenu = isContextMenu();
     for(int i = 0; i <= lastVisibleAction; i++) {
         QAction *action = actions.at(i);
         const bool isSection = action->isSeparator() && (!action->text().isEmpty() || !action->icon().isNull());
@@ -391,7 +398,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
                     tabWidth = qMax(int(tabWidth), qfm.width(s.mid(t+1)));
                     s = s.left(t);
     #ifndef QT_NO_SHORTCUT
-                } else {
+                } else if (action->isShortcutVisibleInContextMenu() || !contextMenu) {
                     QKeySequence seq = action->shortcut();
                     if (!seq.isEmpty())
                         tabWidth = qMax(int(tabWidth), qfm.width(seq.toString(QKeySequence::NativeText)));
@@ -1521,7 +1528,8 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
         option->icon = action->icon();
     QString textAndAccel = action->text();
 #ifndef QT_NO_SHORTCUT
-    if (textAndAccel.indexOf(QLatin1Char('\t')) == -1) {
+    if ((action->isShortcutVisibleInContextMenu() || !d->isContextMenu())
+            && textAndAccel.indexOf(QLatin1Char('\t')) == -1) {
         QKeySequence seq = action->shortcut();
         if (!seq.isEmpty())
             textAndAccel += QLatin1Char('\t') + seq.toString(QKeySequence::NativeText);
@@ -2331,7 +2339,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
         screen = d->popupGeometry();
     else
 #endif
-    screen = d->popupGeometry(QApplication::desktop()->screenNumber(p));
+    screen = d->popupGeometry(QDesktopWidgetPrivate::screenNumber(p));
     d->updateActionRects(screen);
 
     QPoint pos;
@@ -2431,8 +2439,6 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
                 pos.setY(qMin(mouse.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1));
             else
                 pos.setY(qMax(p.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1));
-        } else if (pos.y() < screen.top() + desktopFrame) {
-            pos.setY(screen.top() + desktopFrame);
         }
 
         if (pos.y() < screen.top() + desktopFrame)
@@ -2664,7 +2670,8 @@ void QMenu::hideEvent(QHideEvent *)
     if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
         mb->d_func()->setCurrentAction(0);
 #endif
-    d->mouseDown = 0;
+    if (d->mouseDown == this)
+        d->mouseDown = 0;
     d->hasHadMouse = false;
     if (d->activeMenu)
         d->hideMenu(d->activeMenu);
@@ -3601,7 +3608,7 @@ void QMenu::internalDelayedPopup()
         screen = d->popupGeometry();
     else
 #endif
-    screen = d->popupGeometry(QApplication::desktop()->screenNumber(pos()));
+    screen = d->popupGeometry(QDesktopWidgetPrivate::screenNumber(pos()));
 
     int subMenuOffset = style()->pixelMetric(QStyle::PM_SubMenuOverlap, 0, this);
     const QRect actionRect(d->actionRect(d->currentAction));