fly/flightgear
1
0
Fork 0
Code Activity

PUI: simplify dialog binding handling

Browse source 
Fixes a perf issue when opening and closing dialogs which uses
bindings, reported by Michael Danilov - huge thanks for his help
in tracking this down.

This bug was caused by the SGBinding ‘don’t delete properties’ change,
since the PUI code was copying nodes to work-around that problem. With
SGBinding fixed, the copying caused huge numbers of nodes under
/sim/bindings/gui
This commit is contained in:
James Turner 2018-05-28 19:51:41 +02:00
parent 16b8335a5e
commit ea9ae959e4
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/GUI/FGPUIDialog.cxx
View file

@ -1166,26 +1166,18 @@ FGPUIDialog::setupObject (puObject *object, SGPropertyNode *props)
}
SGPropertyNode *dest = fgGetNode("/sim/bindings/gui", true);
std::vector<SGPropertyNode_ptr> bindings = props->getChildren("binding");
if (bindings.size() > 0) {
const auto bindings = props->getChildren("binding");
if (!bindings.empty()) {
info->key = props->getIntValue("keynum", -1);
if (props->hasValue("key"))
info->key = getKeyCode(props->getStringValue("key", ""));
for (unsigned int i = 0; i < bindings.size(); i++) {
unsigned int j = 0;
SGPropertyNode_ptr binding;
while (dest->getChild("binding", j))
j++;
const char *cmd = bindings[i]->getStringValue("command");
for (auto bindingNode : bindings) {
const char *cmd = bindingNode->getStringValue("command");
if (!strcmp(cmd, "nasal"))
bindings[i]->setStringValue("module", _module.c_str());
bindingNode->setStringValue("module", _module.c_str());
binding = dest->getChild("binding", j, true);
copyProperties(bindings[i], binding);
info->bindings.push_back(new SGBinding(binding, globals->get_props()));
info->bindings.push_back(new SGBinding(bindingNode, globals->get_props()));
}
object->setCallback(action_callback);
}