From 5d10e338d5d07ed17c6b820c6433b5d5dcfdd76f Mon Sep 17 00:00:00 2001 From: mfranz Date: Tue, 25 Jul 2006 22:21:56 +0000 Subject: [PATCH] no more FONT_(LARGE|SMALL) (didn't work, anyway, and isn't needed) --- src/Instrumentation/HUD/HUD.hxx | 6 ------ src/Instrumentation/HUD/HUD_label.cxx | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx index a52176317..113baf67b 100644 --- a/src/Instrumentation/HUD/HUD.hxx +++ b/src/Instrumentation/HUD/HUD.hxx @@ -423,11 +423,6 @@ private: STRING, }; - enum FontSize { - FONT_SMALL, - FONT_LARGE - }; - Format check_format(const char *) const; bool blink(); @@ -435,7 +430,6 @@ private: Format _mode; string _format; Adjust _halign; - int _fontsize; int _blink; bool _box; float _text_y; diff --git a/src/Instrumentation/HUD/HUD_label.cxx b/src/Instrumentation/HUD/HUD_label.cxx index 17fc2798d..3c33245c4 100644 --- a/src/Instrumentation/HUD/HUD_label.cxx +++ b/src/Instrumentation/HUD/HUD_label.cxx @@ -30,7 +30,6 @@ HUD::Label::Label(HUD *hud, const SGPropertyNode *n, float x, float y) : Item(hud, n, x, y), _input(n->getNode("input", false)), - _fontsize(fgGetInt("/sim/startup/xsize") > 1000 ? FONT_LARGE : FONT_SMALL), // FIXME _box(n->getBoolValue("box", false)), _pointer_width(n->getFloatValue("pointer-width", 7.0)), _pointer_length(n->getFloatValue("pointer-length", 5.0)), @@ -170,11 +169,7 @@ void HUD::Label::draw(void) posincr = 0; posincr += _hud->_font->getGap() / 2.0 - L; - - if (_fontsize == FONT_SMALL) - draw_text(_x + posincr, _text_y, buf, get_digits()); - else if (_fontsize == FONT_LARGE) - draw_text(_x + posincr, _text_y, buf, get_digits()); + draw_text(_x + posincr, _text_y, buf, get_digits()); }