fly/flightgear
1
0
Fork 0
Code Activity

Cocoa menu fixes for reset

Browse source
This commit is contained in:
James Turner 2013-11-23 19:59:09 +00:00
parent 2015016466
commit 57c9ed1ae3
1 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/GUI/FGCocoaMenuBar.mm
View file

@ -38,6 +38,7 @@ public:
CocoaMenuDelegate* delegate; CocoaMenuDelegate* delegate;
MenuItemBindings itemBindings; MenuItemBindings itemBindings;
std::vector<SGPropertyChangeListener*> listeners;
}; };
// prior to the 10.6 SDK, NSMenuDelegate was an informal protocol // prior to the 10.6 SDK, NSMenuDelegate was an informal protocol
@ -124,7 +125,14 @@ namespace {
public: public:
CocoaEnabledListener(NSMenuItem* i) : CocoaEnabledListener(NSMenuItem* i) :
item(i) item(i)
{} {
}
~CocoaEnabledListener()
{
}
virtual void valueChanged(SGPropertyNode *node) virtual void valueChanged(SGPropertyNode *node)
@ -179,7 +187,9 @@ void FGCocoaMenuBar::CocoaMenuBarPrivate::menuFromProps(NSMenu* menu, SGProperty
setItemShortcutFromString(item, shortcut); setItemShortcutFromString(item, shortcut);
} }
n->getNode("enabled")->addChangeListener(new CocoaEnabledListener(item)); SGPropertyChangeListener* enableListener = new CocoaEnabledListener(item);
listeners.push_back(enableListener);
n->getNode("enabled")->addChangeListener(enableListener);
[item setTarget:delegate]; [item setTarget:delegate];
[item setAction:@selector(itemAction:)]; [item setAction:@selector(itemAction:)];
} }
@ -191,16 +201,8 @@ void FGCocoaMenuBar::CocoaMenuBarPrivate::menuFromProps(NSMenu* menu, SGProperty
BOOL enabled = n->getBoolValue("enabled"); BOOL enabled = n->getBoolValue("enabled");
[item setEnabled:enabled]; [item setEnabled:enabled];
SGBindingList bl; SGBindingList bl = readBindingList(n->getChildren("binding"), globals->get_props());
BOOST_FOREACH(SGPropertyNode_ptr binding, n->getChildren("binding")) {
// have to clone the bindings, since SGBinding takes ownership of the
// passed in node. Seems like something is wrong here, but following the
// PUI code for the moment.
SGPropertyNode* cloned(new SGPropertyNode);
copyProperties(binding, cloned);
bl.push_back(new SGBinding(cloned, globals->get_props()));
}
itemBindings[item] = bl; itemBindings[item] = bl;
++index; ++index;
} // of item iteration } // of item iteration
@ -212,10 +214,8 @@ void FGCocoaMenuBar::CocoaMenuBarPrivate::fireBindingsForItem(NSMenuItem *item)
if (it == itemBindings.end()) { if (it == itemBindings.end()) {
return; return;
} }
BOOST_FOREACH(SGSharedPtr<SGBinding> b, it->second) { fireBindingList(it->second);
b->fire();
}
} }
FGCocoaMenuBar::FGCocoaMenuBar() : FGCocoaMenuBar::FGCocoaMenuBar() :
@ -226,7 +226,19 @@ FGCocoaMenuBar::FGCocoaMenuBar() :
FGCocoaMenuBar::~FGCocoaMenuBar() FGCocoaMenuBar::~FGCocoaMenuBar()
{ {
CocoaAutoreleasePool ap;
NSMenu* mainBar = [[NSApplication sharedApplication] mainMenu];
int num = [mainBar numberOfItems];
for (int index=1; index < num; ++index) {
NSMenuItem* topLevelItem = [mainBar itemAtIndex:index];
[topLevelItem.submenu removeAllItems];
}
std::vector<SGPropertyChangeListener*>::iterator it;
for (it = p->listeners.begin(); it != p->listeners.end(); ++it) {
delete *it;
}
} }
void FGCocoaMenuBar::init() void FGCocoaMenuBar::init()
@ -271,7 +283,9 @@ void FGCocoaMenuBar::init()
n->setBoolValue("enabled", true); n->setBoolValue("enabled", true);
} }
n->getNode("enabled")->addChangeListener(new CocoaEnabledListener(item)); SGPropertyChangeListener* l = new CocoaEnabledListener(item);
p->listeners.push_back(l);
n->getNode("enabled")->addChangeListener(l);
} }
} }