1
0
Fork 0

- clear alpha like r/g/b

- fix warning
- replace tabs by 4 spaces, according to the style of the file
This commit is contained in:
mfranz 2005-07-09 13:53:25 +00:00
parent f65eb6e3d5
commit f3e88fc05d
2 changed files with 38 additions and 38 deletions

View file

@ -369,7 +369,7 @@ FGDialog::display (SGPropertyNode * props)
LayoutWidget wid(props);
puFont *fnt = _gui->getDefaultFont();
wid.setDefaultFont(fnt, fnt->getPointSize());
wid.setDefaultFont(fnt, int(fnt->getPointSize());
int pw=0, ph=0;
if(!userw || !userh)

View file

@ -208,7 +208,7 @@ public:
return *this;
}
inline void clear() { _red = _green = _blue = -1.0f; _alpha = 1.0f; }
inline void clear() { _red = _green = _blue = _alpha = -1.0f; }
// merges in non-negative components from property with children <red> etc.
void merge(const SGPropertyNode *prop);
void merge(const FGColor& color);