385589ef45
Instead of waiting for the menu delegate to update each item, we can attach an NSMenu to its NSMenuItem as soon as we update the current window's menubar. This is safe to do because we know that this is going to be the main menubar right after, so we're not orphaning any NSMenuItem from its NSMenu at the wrong moment. By doing this, we also ensure that all menus from the active menubar are reachable by the key-equivalent dispatching logic, even before we display the actual menu. This was shown in BigMenuCreator where, under the menubar's ASP and SAP menus, all A*S submenus would be disabled. Furthermore, on the same menus, SAP would show the same issue. Added test in Menurama as well. Change-Id: If6e7311072e6b53ad1cbced73623d1832aa0df8e Task-number: QTBUG-57076 Task-number: QTBUG-63712 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
99 lines
3.4 KiB
C++
99 lines
3.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2017 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** 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 https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "mainwindow.h"
|
|
#include "ui_mainwindow.h"
|
|
#include "menuramaapplication.h"
|
|
#include <QDebug>
|
|
|
|
MainWindow::MainWindow(QWidget *parent) :
|
|
QMainWindow(parent),
|
|
ui(new Ui::MainWindow)
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
auto *a = ui->menuStuff->addAction("Enabled Submenu (QTBUG-63172)");
|
|
auto *qtbug63172_Menu = new QMenu;
|
|
qtbug63172_Menu->addAction("We're Good!");
|
|
a->setMenu(qtbug63172_Menu);
|
|
|
|
startTimer(1000);
|
|
|
|
connect(ui->menuAfter_aboutToShow, &QMenu::aboutToShow, [=] {
|
|
menuApp->populateMenu(ui->menuAfter_aboutToShow, true /*clear*/);
|
|
});
|
|
|
|
connect(ui->menuDynamic_Stuff, &QMenu::aboutToShow, [=] {
|
|
menuApp->addDynMenu(QLatin1String("Menu Added After aboutToShow()"), ui->menuDynamic_Stuff);
|
|
|
|
const QLatin1String itemTitle = QLatin1String("Disabled Item Added After aboutToShow()");
|
|
if (QAction *a = menuApp->findAction(itemTitle, ui->menuDynamic_Stuff))
|
|
ui->menuDynamic_Stuff->removeAction(a);
|
|
QAction *a = ui->menuDynamic_Stuff->addAction(itemTitle);
|
|
a->setEnabled(false);
|
|
});
|
|
|
|
connect(ui->pushButton, &QPushButton::clicked, [=] {
|
|
menuApp->populateMenu(ui->menuOn_Click, true /*clear*/);
|
|
});
|
|
|
|
connect(ui->addManyButton, &QPushButton::clicked, [=] {
|
|
QMenu *menu = new QMenu(QLatin1String("Many More ") +
|
|
QString::number(ui->menuBar->actions().count()));
|
|
ui->menuBar->insertMenu(ui->menuDynamic_Stuff->menuAction(), menu);
|
|
for (int i = 0; i < 2000; i++) {
|
|
auto *action = menu->addAction(QLatin1String("Item ") + QString::number(i));
|
|
if (i & 0x1)
|
|
action->setEnabled(false);
|
|
if (i & 0x2)
|
|
action->setVisible(false);
|
|
}
|
|
});
|
|
}
|
|
|
|
MainWindow::~MainWindow()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
void MainWindow::timerEvent(QTimerEvent *)
|
|
{
|
|
menuApp->populateMenu(ui->menuPopulated_by_Timer, true /*clear*/);
|
|
menuApp->addDynMenu(QLatin1String("Added by Timer"), ui->menuDynamic_Stuff);
|
|
}
|
|
|
|
void MainWindow::enableStuffMenu(bool enable)
|
|
{
|
|
ui->menuStuff->setEnabled(enable);
|
|
}
|
|
|
|
void MainWindow::on_actionQuit_triggered()
|
|
{
|
|
menuApp->exit();
|
|
}
|