1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00

Couple of minor tweaks, and a fix for menu bars.

This commit is contained in:
Julian Storer 2010-10-08 20:35:04 +01:00
parent d508109296
commit acbfe6c645
10 changed files with 82 additions and 36 deletions

View file

@ -113,13 +113,12 @@ void MenuBarComponent::paint (Graphics& g)
void MenuBarComponent::resized()
{
xPositions.clear();
int x = 2;
int x = 0;
xPositions.add (x);
for (int i = 0; i < menuNames.size(); ++i)
{
x += getLookAndFeel().getMenuBarItemWidth (*this, i, menuNames[i]);
xPositions.add (x);
}
}
@ -235,7 +234,9 @@ void MenuBarComponent::handleCommandMessage (int commandId)
{
const Point<int> mousePos (getMouseXYRelative());
updateItemUnderMouse (mousePos.getX(), mousePos.getY());
setOpenItem (-1);
if (currentPopupIndex == topLevelIndexClicked)
setOpenItem (-1);
if (commandId != 0 && model != 0)
model->menuItemSelected (commandId, topLevelIndexClicked);