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

ActionContainer: Fix inconsistency in book keeping

Browse Source 
It doesn't make sense to specify both a group ID and a menu to add
another menu before. This most certainly leads to inconsistency in the
internal book keeping in m_groups vs the actual menu insertion point.

Change-Id: Ic30508f390885ddeb72eb94f26efb75456b469ec
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2018-10-10 13:21:53 +02:00
parent c8f4ee66f6
commit e5d1bc9cce
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -263,20 +263,25 @@ void ActionContainerPrivate::addMenu(ActionContainer *menu, Id groupId)
scheduleUpdate(); scheduleUpdate();
} }
void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *menu, Id groupId) void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *menu)
{ {
auto containerPrivate = static_cast<ActionContainerPrivate *>(menu); auto containerPrivate = static_cast<ActionContainerPrivate *>(menu);
if (!containerPrivate->canBeAddedToMenu()) if (!containerPrivate->canBeAddedToMenu())
return; return;
auto container = static_cast<MenuActionContainer *>(containerPrivate); QMutableListIterator<Group> it(m_groups);
const Id actualGroupId = groupId.isValid() ? groupId : Id(Constants::G_DEFAULT_TWO); while (it.hasNext()) {
QList<Group>::const_iterator groupIt = findGroup(actualGroupId); Group &group = it.next();
QTC_ASSERT(groupIt != m_groups.constEnd(), return); const int insertionPoint = group.items.indexOf(before);
QAction *beforeAction = before->menu()->menuAction(); if (insertionPoint >= 0) {
m_groups[groupIt-m_groups.constBegin()].items.append(menu); group.items.insert(insertionPoint, menu);
break;
}
}
connect(menu, &QObject::destroyed, this, &ActionContainerPrivate::itemDestroyed); connect(menu, &QObject::destroyed, this, &ActionContainerPrivate::itemDestroyed);
auto container = static_cast<MenuActionContainer *>(containerPrivate);
QAction *beforeAction = before->menu()->menuAction();
insertMenu(beforeAction, container->menu()); insertMenu(beforeAction, container->menu());
scheduleUpdate(); scheduleUpdate();
} }

2
src/plugins/coreplugin/actionmanager/actioncontainer.h
View File

@@ -64,7 +64,7 @@ public:
virtual void insertGroup(Id before, Id group) = 0; virtual void insertGroup(Id before, Id group) = 0;
virtual void addAction(Command *action, Id group = Id()) = 0; virtual void addAction(Command *action, Id group = Id()) = 0;
virtual void addMenu(ActionContainer *menu, Id group = Id()) = 0; virtual void addMenu(ActionContainer *menu, Id group = Id()) = 0;
virtual void addMenu(ActionContainer *before, ActionContainer *menu, Id group = Id()) = 0; virtual void addMenu(ActionContainer *before, ActionContainer *menu) = 0;
Command *addSeparator(Id group = Id()); Command *addSeparator(Id group = Id());
virtual Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) = 0; virtual Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) = 0;

2
src/plugins/coreplugin/actionmanager/actioncontainer_p.h
View File

@@ -56,7 +56,7 @@ public:
void insertGroup(Id before, Id groupId) override; void insertGroup(Id before, Id groupId) override;
void addAction(Command *action, Id group = Id()) override; void addAction(Command *action, Id group = Id()) override;
void addMenu(ActionContainer *menu, Id group = Id()) override; void addMenu(ActionContainer *menu, Id group = Id()) override;
void addMenu(ActionContainer *before, ActionContainer *menu, Id group = Id()) override; void addMenu(ActionContainer *before, ActionContainer *menu) override;
Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) override; Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) override;
void clear() override; void clear() override;