fly/flightgear
1
0
Fork 0
Code Activity

use global fontcache ... this is mostly cosmetic, as the whole file will

Browse source 
probably die a soon as the old property picker was removed
This commit is contained in:
mfranz 2006-06-06 16:33:38 +00:00
parent 15dbbbf143
commit 88beabb2d3
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/GUI/gui.cxx
View file

@ -45,6 +45,7 @@
#include <Main/main.hxx> #include <Main/main.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <GUI/new_gui.hxx>
#include "gui.h" #include "gui.h"
#include "gui_local.hxx" #include "gui_local.hxx"
@ -53,7 +54,6 @@
puFont guiFnt = 0; puFont guiFnt = 0;
fntTexFont *guiFntHandle = 0;
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
@ -66,30 +66,18 @@ void guiInit()
char *mesa_win_state; char *mesa_win_state;
// Initialize PUI // Initialize PUI
#ifndef PU_USE_NONE
puInit(); puInit();
#endif
puSetDefaultStyle ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT puSetDefaultStyle ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT
puSetDefaultColourScheme (0.8, 0.8, 0.9, 1); puSetDefaultColourScheme (0.8, 0.8, 0.9, 1);
// Next check home directory FGFontCache *fc = globals->get_fontcache();
SGPath fntpath; puFont *GuiFont = fc->get(globals->get_locale()->getStringValue("font", "typewriter.txf"), 15);
char* envp = ::getenv( "FG_FONTS" ); puSetDefaultFonts(*GuiFont, *GuiFont);
if ( envp != NULL ) {
fntpath.set( envp );
} else {
fntpath.set( globals->get_fg_root() );
fntpath.append( "Fonts" );
}
// Install our fast fonts
SGPropertyNode *locale = globals->get_locale();
fntpath.append(locale->getStringValue("font", "typewriter.txf"));
guiFntHandle = new fntTexFont ;
guiFntHandle -> load ( (char *)fntpath.c_str() ) ;
puFont GuiFont ( guiFntHandle, 15 ) ;
puSetDefaultFonts( GuiFont, GuiFont ) ;
guiFnt = puGetDefaultLabelFont(); guiFnt = puGetDefaultLabelFont();
LayoutWidget::setDefaultFont(&GuiFont, 15); LayoutWidget::setDefaultFont(GuiFont, 15);
if (!fgHasNode("/sim/startup/mouse-pointer")) { if (!fgHasNode("/sim/startup/mouse-pointer")) {
// no preference specified for mouse pointer, attempt to autodetect... // no preference specified for mouse pointer, attempt to autodetect...