Make the dialogs work again.
This commit is contained in:
parent
d2271c3bf4
commit
d4b8a81a44
1 changed files with 10 additions and 8 deletions
|
@ -359,10 +359,10 @@ FGDialog::display (SGPropertyNode * props)
|
||||||
int screenw = globals->get_props()->getIntValue("/sim/startup/xsize");
|
int screenw = globals->get_props()->getIntValue("/sim/startup/xsize");
|
||||||
int screenh = globals->get_props()->getIntValue("/sim/startup/ysize");
|
int screenh = globals->get_props()->getIntValue("/sim/startup/ysize");
|
||||||
|
|
||||||
bool userx = props->hasValue("x");
|
// bool userx = props->hasValue("x");
|
||||||
bool usery = props->hasValue("y");
|
// bool usery = props->hasValue("y");
|
||||||
bool userw = props->hasValue("width");
|
// bool userw = props->hasValue("width");
|
||||||
bool userh = props->hasValue("height");
|
// bool userh = props->hasValue("height");
|
||||||
|
|
||||||
LayoutWidget wid(props);
|
LayoutWidget wid(props);
|
||||||
int pw=0, ph=0;
|
int pw=0, ph=0;
|
||||||
|
@ -377,11 +377,13 @@ FGDialog::display (SGPropertyNode * props)
|
||||||
_object = makeObject(props, screenw, screenh);
|
_object = makeObject(props, screenw, screenh);
|
||||||
|
|
||||||
// Remove automatically generated properties, so the layout looks
|
// Remove automatically generated properties, so the layout looks
|
||||||
|
// EMH - this isn't needed anymore since the layout remains in
|
||||||
|
// the poprty tree now.
|
||||||
// the same next time around.
|
// the same next time around.
|
||||||
if(!userx) props->removeChild("x");
|
// if(!userx) props->removeChild("x");
|
||||||
if(!usery) props->removeChild("y");
|
// if(!usery) props->removeChild("y");
|
||||||
if(!userw) props->removeChild("width");
|
// if(!userw) props->removeChild("width");
|
||||||
if(!userh) props->removeChild("height");
|
// if(!userh) props->removeChild("height");
|
||||||
|
|
||||||
if (_object != 0) {
|
if (_object != 0) {
|
||||||
_object->reveal();
|
_object->reveal();
|
||||||
|
|
Loading…
Reference in a new issue