fly/flightgear
1
0
Fork 0
Code Activity

tell the layouter about the default font (I wonder why

Browse source 
LayoutWidget::setDefaultFont() wants puFont* /and/ pointsize as extra
parameters, when puFont knows its pointsize anyway. Didn't want to change
that yet, though.) Now the HELVETICA_10 font makes actually sense. :-)
This commit is contained in:
mfranz 2005-07-08 20:12:06 +00:00
parent 18a874f1b2
commit f65eb6e3d5
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/dialog.cxx
View file

@ -368,6 +368,9 @@ FGDialog::display (SGPropertyNode * props)
// Let the layout widget work in the same property subtree. // Let the layout widget work in the same property subtree.
LayoutWidget wid(props); LayoutWidget wid(props);
puFont *fnt = _gui->getDefaultFont();
wid.setDefaultFont(fnt, fnt->getPointSize());
int pw=0, ph=0; int pw=0, ph=0;
if(!userw || !userh) if(!userw || !userh)
wid.calcPrefSize(&pw, &ph); wid.calcPrefSize(&pw, &ph);

6
src/GUI/new_gui.hxx
View file

@ -151,8 +151,10 @@ public:
*/ */
virtual FGDialog * getActiveDialog (); virtual FGDialog * getActiveDialog ();
const FGColor& getColor (const char * which) { return _colors[which]; } virtual const FGColor& getColor (const char * which) { return _colors[which]; }
const FGColor& getColor (string which) { return _colors[which.c_str()]; } virtual const FGColor& getColor (string which) { return _colors[which.c_str()]; }
virtual puFont *getDefaultFont() { return &_font; }
protected: protected: