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

Fix updating of menus with EA_Hide.

Browse Source
This commit is contained in:
con
2010-11-12 13:45:13 +01:00
parent 59004d3dd3
commit d7e7c3427d
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ using namespace Core::Internal;
ActionContainerPrivate::ActionContainerPrivate(int id)
: m_data(0), m_id(id), m_updateRequested(false)
{
scheduleUpdate();
}
void ActionContainerPrivate::setEmptyAction(EmptyAction ea)
@@ -251,6 +251,7 @@ void ActionContainerPrivate::addAction(Command *action, int pos, bool setpos)
m_posmap.insert(pos, action->id());
connect(action, SIGNAL(activeStateChanged()), this, SLOT(scheduleUpdate()));
insertAction(ba, a->action());
scheduleUpdate();
}
void ActionContainerPrivate::addMenu(ActionContainer *menu, int pos, bool setpos)
@@ -271,6 +272,7 @@ void ActionContainerPrivate::addMenu(ActionContainer *menu, int pos, bool setpos
m_subContainers.append(menu);
m_posmap.insert(pos, menu->id());
insertMenu(ba, mc->menu());
scheduleUpdate();
}
QAction *ActionContainerPrivate::beforeAction(int pos, int *prevKey) const
@@ -418,9 +420,9 @@ bool MenuActionContainer::updateInternal()
}
if (hasEmptyAction(EA_Hide))
m_menu->setVisible(hasitems);
m_menu->menuAction()->setVisible(hasitems);
else if (hasEmptyAction(EA_Disable))
m_menu->setEnabled(hasitems);
m_menu->menuAction()->setEnabled(hasitems);
return hasitems;
}