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

always use courier new 8 on win32 again

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@351 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-04-27 19:01:38 +00:00
parent 97c46409b7
commit babc991433
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radiant/mainframe.cpp
View File

@ -3323,11 +3323,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.getDisplayList(); GlobalOpenGL().m_font = g_font.getDisplayList();
GlobalOpenGL().m_fontHeight = g_font.getPixelHeight(); GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();

2
radiant/xywindow.cpp
View File

@ -1844,7 +1844,7 @@ void XYWnd::XY_DrawGrid(void) {
glColor3fv(vector3_to_array(g_xywindow_globals.color_gridtext)); glColor3fv(vector3_to_array(g_xywindow_globals.color_gridtext));
// why does this not work on windows: // why does this not work on windows:
// float offx = m_vOrigin[nDim2] + h - (1 + GlobalOpenGL().m_fontAscent) / m_fScale; // float offx = m_vOrigin[nDim2] + h - (1 + GlobalOpenGL().m_fontAscent) / m_fScale;
float offx = m_vOrigin[nDim2] + h - 14 / m_fScale; float offx = m_vOrigin[nDim2] + h - 13 / m_fScale;
float offy = m_vOrigin[nDim1] - w + 1 / m_fScale; float offy = m_vOrigin[nDim1] - w + 1 / m_fScale;
for (x = xb - fmod(xb, stepx); x <= xe ; x += stepx) { for (x = xb - fmod(xb, stepx); x <= xe ; x += stepx) {
glRasterPos2f (x, offx); glRasterPos2f (x, offx);