fly/flightgear
1
0
Fork 0
Code Activity

add support for a <hide> property, which hides whole XML groups (widgets

Browse source 
or data blocks) from layouter and dialog creator. This is required for
dynamically generated/modified dialogs. Parts in the XML file can be
hidden and turned on by the C++ code. Other hidden parts can be used
as templates that are multiply used. Hidden datablocks can contain
strings that are used in dialog context, that are easier to translate
or modify in the XML file.
This commit is contained in:
mfranz 2005-10-21 17:47:48 +00:00
parent c53b7bbec3
commit 58179758af
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/dialog.cxx
View file

@ -406,6 +406,9 @@ FGDialog::display (SGPropertyNode * props)
puObject * puObject *
FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight) FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
{ {
if (props->getBoolValue("hide"))
return 0;
bool presetSize = props->hasValue("width") && props->hasValue("height"); bool presetSize = props->hasValue("width") && props->hasValue("height");
int width = props->getIntValue("width", parentWidth); int width = props->getIntValue("width", parentWidth);
int height = props->getIntValue("height", parentHeight); int height = props->getIntValue("height", parentHeight);

12
src/GUI/layout.cxx
View file

@ -39,6 +39,9 @@ void LayoutWidget::calcPrefSize(int* w, int* h)
{ {
*w = *h = 0; // Ask for nothing by default *w = *h = 0; // Ask for nothing by default
if (getBool("hide"))
return;
int legw = stringLength(getStr("legend")); int legw = stringLength(getStr("legend"));
int labw = stringLength(getStr("label")); int labw = stringLength(getStr("label"));
@ -94,6 +97,9 @@ void LayoutWidget::calcPrefSize(int* w, int* h)
// Set up geometry such that the widget lives "inside" the specified // Set up geometry such that the widget lives "inside" the specified
void LayoutWidget::layout(int x, int y, int w, int h) void LayoutWidget::layout(int x, int y, int w, int h)
{ {
if (getBool("hide"))
return;
setNum("__bx", x); setNum("__bx", x);
setNum("__by", y); setNum("__by", y);
setNum("__bw", w); setNum("__bw", w);
@ -192,6 +198,9 @@ void LayoutWidget::doHVBox(bool doLayout, bool vertical, int* w, int* h)
int nEq = 0, eqA = 0, eqB = 0, eqTotalA = 0; int nEq = 0, eqA = 0, eqB = 0, eqTotalA = 0;
for(i=0; i<nc; i++) { for(i=0; i<nc; i++) {
LayoutWidget child = getChild(i); LayoutWidget child = getChild(i);
if (child.getBool("hide"))
continue;
int a, b; int a, b;
child.calcPrefSize(vertical ? &b : &a, vertical ? &a : &b); child.calcPrefSize(vertical ? &b : &a, vertical ? &a : &b);
if(doLayout) prefA[i] = a; if(doLayout) prefA[i] = a;
@ -227,6 +236,9 @@ void LayoutWidget::doHVBox(bool doLayout, bool vertical, int* w, int* h)
// from top to bottom instead of along the cartesian Y axis. // from top to bottom instead of along the cartesian Y axis.
int idx = vertical ? (nc-i-1) : i; int idx = vertical ? (nc-i-1) : i;
LayoutWidget child = getChild(idx); LayoutWidget child = getChild(idx);
if (child.getBool("hide"))
continue;
if(child.getBool("equal")) { if(child.getBool("equal")) {
int pad = child.padding(); int pad = child.padding();
prefA[idx] = eqA + 2*pad; prefA[idx] = eqA + 2*pad;