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

Make sure QDBusMenuBar is restored when the window is hidden and shown

Browse Source 
Task-number: QTBUG-58723
Change-Id: Ib4c3dac8a8cce717f4d47ab619c05b9e1719f311
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Dmitry Shachnev 2017-03-16 14:48:49 +03:00 committed by Shawn Rutledge
parent 38550c562d
commit 41750492db
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
View File

@ -120,7 +120,7 @@ void QDBusMenuBar::syncMenu(QPlatformMenu *menu)
void QDBusMenuBar::handleReparent(QWindow *newParentWindow) void QDBusMenuBar::handleReparent(QWindow *newParentWindow)
{ {
if (newParentWindow && newParentWindow->winId() != m_windowId) { if (newParentWindow) {
unregisterMenuBar(); unregisterMenuBar();
m_windowId = newParentWindow->winId(); m_windowId = newParentWindow->winId();
registerMenuBar(); registerMenuBar();

11
src/widgets/widgets/qmenubar.cpp
View File

@ -1474,6 +1474,17 @@ bool QMenuBar::eventFilter(QObject *object, QEvent *event)
} }
} }
if (isNativeMenuBar() && event->type() == QEvent::ShowToParent) {
// On some desktops like Unity, the D-Bus menu bar is unregistered
// when the window is hidden. So when the window is shown, we need
// to forcefully re-register it. The only way to force re-registering
// with D-Bus menu is the handleReparent method.
QWidget *widget = qobject_cast<QWidget *>(object);
QWindow *handle = widget ? widget->windowHandle() : nullptr;
if (handle != nullptr)
d->platformMenuBar->handleReparent(handle);
}
if (style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, this)) { if (style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, this)) {
if (d->altPressed) { if (d->altPressed) {
switch (event->type()) { switch (event->type()) {