quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix some more of the weird workarounds"

Browse Source 
This reverts commit b8ef001e49.
This commit is contained in:
Rudolf Polzer 2010-12-11 14:52:52 +01:00
parent b8ef001e49
commit 50218d2883
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gtkutil/glfont.cpp
View File

@ -206,10 +206,10 @@ class GLFontInternal: public GLFont
int font_descent_pango_units; int font_descent_pango_units;
#if !PANGO_VERSION_CHECK(1,22,0) #if !PANGO_VERSION_CHECK(1,22,0)
ft2_context = pango_ft2_get_context(96, 96); ft2_context = pango_ft2_get_context(72, 72);
#else #else
fontmap = pango_ft2_font_map_new(); fontmap = pango_ft2_font_map_new();
//pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fontmap), 96, 96); pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fontmap), 72, 72);
ft2_context = pango_font_map_create_context(fontmap); ft2_context = pango_font_map_create_context(fontmap);
#endif #endif

5
radiant/mainframe.cpp
View File

@ -3333,11 +3333,16 @@ void GlobalGL_sharedContextCreated()
GlobalShaderCache().realise(); GlobalShaderCache().realise();
Textures_Realise(); Textures_Realise();
#ifdef WIN32
/* win32 is dodgy here, just use courier new then */
g_font = glfont_create("courier new 8");
#else
/* use default font here (Sans 10 is gtk default) */ /* use default font here (Sans 10 is gtk default) */
GtkSettings *settings = gtk_settings_get_default(); GtkSettings *settings = gtk_settings_get_default();
gchar *fontname; gchar *fontname;
g_object_get(settings, "gtk-font-name", &fontname, NULL); g_object_get(settings, "gtk-font-name", &fontname, NULL);
g_font = glfont_create(fontname); g_font = glfont_create(fontname);
#endif
GlobalOpenGL().m_font = g_font; GlobalOpenGL().m_font = g_font;
} }