tweak the GL widget font (for windows mostly)

This commit is contained in:
Timothee "TTimo" Besset 2013-07-05 15:55:09 -05:00
parent ee3bc7b353
commit 5df79a9c62
3 changed files with 5 additions and 8 deletions

3
.gitignore vendored
View file

@ -6,6 +6,7 @@
/install/q3map2 /install/q3map2
/install/q3map2_urt /install/q3map2_urt
/install/radiant.bin /install/radiant.bin
/install/share
/packs /packs
/site.sconf /site.sconf
/.sconsign.dblite /.sconsign.dblite
@ -13,3 +14,5 @@
*.so *.so
.settings .settings
.DS_Store .DS_Store
*.obj
*.tlog

View file

@ -789,8 +789,7 @@ void CSynapseClient::Shutdown(){
APIDescriptor_t *pAPI = *iAPI; APIDescriptor_t *pAPI = *iAPI;
if ( pAPI->mRefCount != 0 ) { if ( pAPI->mRefCount != 0 ) {
Syn_Printf( "WARNING: ~CSynapseClient '%s' has non-zero ref count for interface '%s' '%s'\n", GetInfo(), pAPI->major_name, pAPI->minor_name ); Syn_Printf( "WARNING: ~CSynapseClient '%s' has non-zero ref count for interface '%s' '%s'\n", GetInfo(), pAPI->major_name, pAPI->minor_name );
} } else {
else{
delete pAPI; delete pAPI;
} }
*iAPI = NULL; *iAPI = NULL;

View file

@ -204,13 +204,8 @@ gboolean WINAPI gtk_glwidget_make_current( GtkWidget *widget ){
// Think about rewriting this font stuff to use OpenGL display lists and glBitmap(). // Think about rewriting this font stuff to use OpenGL display lists and glBitmap().
// Bit maps together with display lists may offer a performance increase, but // Bit maps together with display lists may offer a performance increase, but
// they would not allow antialiased fonts. // they would not allow antialiased fonts.
#ifdef _WIN32 static const char font_string[] = "Monospace bold";
static const char font_string[] = "Courier bold";
static const int font_height = 9;
#else
static const char font_string[] = "Monospace";
static const int font_height = 10; static const int font_height = 10;
#endif
static int font_ascent = -1; static int font_ascent = -1;
static int font_descent = -1; static int font_descent = -1;
static int y_offset_bitmap_render_pango_units = -1; static int y_offset_bitmap_render_pango_units = -1;