feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Group also proxy actions of commands in Edit3DWidget

Browse Source 
This fixes exclusion handling when actions are triggered via shortcuts.

Fixes: QDS-6301
Change-Id: Iedfaaed0c2f7d534fa77743a6daa093e334d001d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Miikka Heikkinen
2022-03-03 16:50:10 +02:00
parent 0fa5303916
commit 8da5a772fe
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -79,6 +79,7 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
auto handleActions = [this, &context](const QVector<Edit3DAction *> &actions, QMenu *menu, bool left) { auto handleActions = [this, &context](const QVector<Edit3DAction *> &actions, QMenu *menu, bool left) {
bool previousWasSeparator = true; bool previousWasSeparator = true;
QActionGroup *group = nullptr; QActionGroup *group = nullptr;
QActionGroup *proxyGroup = nullptr;
for (auto action : actions) { for (auto action : actions) {
if (action) { if (action) {
QAction *a = action->action(); QAction *a = action->action();
@@ -99,6 +100,8 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
Core::Command *command = Core::ActionManager::registerAction( Core::Command *command = Core::ActionManager::registerAction(
a, action->menuId().constData(), context); a, action->menuId().constData(), context);
command->setDefaultKeySequence(a->shortcut()); command->setDefaultKeySequence(a->shortcut());
if (proxyGroup)
proxyGroup->addAction(command->action());
// Menu actions will have custom tooltips // Menu actions will have custom tooltips
if (menu) if (menu)
a->setToolTip(command->stringWithAppendedShortcut(a->toolTip())); a->setToolTip(command->stringWithAppendedShortcut(a->toolTip()));
@@ -110,9 +113,11 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
} else { } else {
if (previousWasSeparator) { if (previousWasSeparator) {
group = new QActionGroup(this); group = new QActionGroup(this);
proxyGroup = new QActionGroup(this);
previousWasSeparator = false; previousWasSeparator = false;
} else { } else {
group = nullptr; group = nullptr;
proxyGroup = nullptr;
auto separator = new QAction(this); auto separator = new QAction(this);
separator->setSeparator(true); separator->setSeparator(true);
if (menu) { if (menu) {