fly/flightgear
1
0
Fork 0
Code Activity

treat widget input correctly

Browse source
This commit is contained in:
mfranz 2006-05-23 20:24:56 +00:00
parent e0b1d12a60
commit 9c98766700
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/GUI/property_list.cxx
View file

@ -111,10 +111,9 @@ void PropertyList::delete_arrays()
for (int i = 0; i < _num_entries; i++) for (int i = 0; i < _num_entries; i++)
delete[] _entries[i]; delete[] _entries[i];
for (int j = 0; j < _num_children; j++) { for (int j = 0; j < _num_children; j++)
if (!_children[j]->nChildren()) if (!_children[j]->nChildren())
_children[j]->removeChangeListener(this); _children[j]->removeChangeListener(this);
}
delete[] _entries; delete[] _entries;
delete[] _children; delete[] _children;
@ -297,9 +296,23 @@ void PropertyList::valueChanged(SGPropertyNode *nd)
void PropertyList::setValue(const char *s) void PropertyList::setValue(const char *s)
{ {
SGPropertyNode *p = fgGetNode(s, false); SGPropertyNode *p;
if (p) try {
setCurrent(p); p = fgGetNode(s, false);
} catch (const stdString& m) {
SG_LOG(SG_GENERAL, SG_DEBUG, "property-list: " << m);
return;
}
setCurrent(p);
} }
void PropertyList::setCurrent(SGPropertyNode *p)
{
bool same = (_curr == p);
_return = _curr = p;
update(same);
if (!same)
publish(p);
}

2
src/GUI/property_list.hxx
View file

@ -36,7 +36,7 @@ public:
~PropertyList(); ~PropertyList();
void update (bool restore_slider_pos = false); void update (bool restore_slider_pos = false);
void setCurrent(SGPropertyNode *p) { _curr = p; update(); publish(p); } void setCurrent(SGPropertyNode *p);
SGPropertyNode *getCurrent() const { return _curr; } SGPropertyNode *getCurrent() const { return _curr; }
void publish(SGPropertyNode *p) { _return = p; invokeCallback(); } void publish(SGPropertyNode *p) { _return = p; invokeCallback(); }
void toggleFlags() { _flags->setBoolValue(!_flags->getBoolValue()); } void toggleFlags() { _flags->setBoolValue(!_flags->getBoolValue()); }