fly/flightgear
1
0
Fork 0
Code Activity

- make aircraft list no longer stick out from its dialog box

Browse source 
- cosmetics: consistent coding style (and "if" is not a function :-)
This commit is contained in:
mfranz 2006-03-25 07:45:50 +00:00
parent c712c35d1d
commit 651db1845b
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/GUI/dialog.cxx
View file

@ -561,7 +561,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
int slider_width = props->getIntValue("slider", 20); int slider_width = props->getIntValue("slider", 20);
puList * obj = new puList(x, y, x + width, y + height, entries, slider_width); puList * obj = new puList(x, y, x + width, y + height, entries, slider_width);
if(presetSize) if (presetSize)
obj->setSize(width, height); obj->setSize(width, height);
setupObject(obj, props); setupObject(obj, props);
setColor(obj, props); setColor(obj, props);
@ -569,6 +569,8 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
} else if (type == "airport-list") { } else if (type == "airport-list") {
AirportList * obj = new AirportList(x, y, x + width, y + height); AirportList * obj = new AirportList(x, y, x + width, y + height);
if (presetSize)
obj->setSize(width, height);
setupObject(obj, props); setupObject(obj, props);
setColor(obj, props); setColor(obj, props);
return obj; return obj;
@ -592,8 +594,10 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
} }
// Layed-out objects need their size set, and non-layout ones // Layed-out objects need their size set, and non-layout ones
// get a different placement. // get a different placement.
if(presetSize) obj->setSize(width, height); if (presetSize)
else obj->setLabelPlace(PUPLACE_LABEL_DEFAULT); obj->setSize(width, height);
else
obj->setLabelPlace(PUPLACE_LABEL_DEFAULT);
setColor(obj, props, LABEL); setColor(obj, props, LABEL);
return obj; return obj;
@ -618,7 +622,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
obj = new puOneShot(x, y, legend); obj = new puOneShot(x, y, legend);
else else
obj = new puButton(x, y, legend); obj = new puButton(x, y, legend);
if(presetSize) if (presetSize)
obj->setSize(width, height); obj->setSize(width, height);
setupObject(obj, props); setupObject(obj, props);
setColor(obj, props); setColor(obj, props);
@ -646,7 +650,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
obj->setMinValue(props->getFloatValue("min", 0.0)); obj->setMinValue(props->getFloatValue("min", 0.0));
obj->setMaxValue(props->getFloatValue("max", 1.0)); obj->setMaxValue(props->getFloatValue("max", 1.0));
setupObject(obj, props); setupObject(obj, props);
if(presetSize) if (presetSize)
obj->setSize(width, height); obj->setSize(width, height);
setColor(obj, props, FOREGROUND|LABEL); setColor(obj, props, FOREGROUND|LABEL);
return obj; return obj;
@ -672,7 +676,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
else else
obj->enableInput(); obj->enableInput();
} }
if(presetSize) if (presetSize)
obj->setSize(width, height); obj->setSize(width, height);
setupObject(obj, props); setupObject(obj, props);
setColor(obj, props, FOREGROUND|LABEL); setColor(obj, props, FOREGROUND|LABEL);