------------------------------------------------------------------------
r327 | mattn | 2009-02-01 17:09:49 +0100 (Sun, 01 Feb 2009) | 1 line * merged r22231 from uforadiant: 'use gtk default font instead of defined ones for linux/windows (which could happen to be not installed)' ------------------------------------------------------------------------ git-svn-id: svn://svn.icculus.org/netradiant/trunk@180 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
parent
4995efdd75
commit
af88b4208b
|
|
@ -3321,13 +3321,12 @@ void GlobalGL_sharedContextCreated()
|
|||
GlobalShaderCache().realise();
|
||||
Textures_Realise();
|
||||
|
||||
#if defined(WIN32)
|
||||
g_font = glfont_create("courier new 8");
|
||||
#elif defined(__linux__)
|
||||
g_font = glfont_create("fixed 8");
|
||||
#else
|
||||
g_font = glfont_create("courier 8");
|
||||
#endif
|
||||
/* use default font here (Sans 10 is gtk default) */
|
||||
GtkSettings *settings = gtk_settings_get_default();
|
||||
gchar *fontname;
|
||||
g_object_get(settings, "gtk-font-name", &fontname, NULL);
|
||||
g_font = glfont_create(fontname);
|
||||
|
||||
GlobalOpenGL().m_font = g_font.getDisplayList();
|
||||
GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user