From 50218d2883c2db2357635affde610b6fe3d79a1f Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 11 Dec 2010 14:52:52 +0100 Subject: [PATCH] Revert "fix some more of the weird workarounds" This reverts commit b8ef001e495fea520a2b46add1948f054a3253d3. --- libs/gtkutil/glfont.cpp | 4 ++-- radiant/mainframe.cpp | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index 12e06b6..a3eac91 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -206,10 +206,10 @@ class GLFontInternal: public GLFont int font_descent_pango_units; #if !PANGO_VERSION_CHECK(1,22,0) - ft2_context = pango_ft2_get_context(96, 96); + ft2_context = pango_ft2_get_context(72, 72); #else 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); #endif diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 452c97f..0aaf664 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -3333,11 +3333,16 @@ void GlobalGL_sharedContextCreated() GlobalShaderCache().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) */ GtkSettings *settings = gtk_settings_get_default(); gchar *fontname; g_object_get(settings, "gtk-font-name", &fontname, NULL); g_font = glfont_create(fontname); +#endif GlobalOpenGL().m_font = g_font; } -- 2.39.2