Merge branch 't/master/sequencestuff'

Warzone2100 · May 14, 2011 · 4d21048 · 4d21048
2 parents be4a8e5 + 7a056bb
commit 4d21048
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 162 deletions.
diff --git a/lib/framework/wzapp.cpp b/lib/framework/wzapp.cpp
@@ -232,6 +232,9 @@ void WzMainWindow::resizeGL(int width, int height)
 	screenWidth = width;
 	screenHeight = height;
 
+	scaledFont.setFamily("DejaVu Sans");
+	scaledFont.setPixelSize(12 * height / 480);
+
 	glViewport(0, 0, width, height);
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
@@ -293,6 +296,8 @@ void WzMainWindow::setFontType(enum iV_fonts fontID)
 	case font_small:
 		setFont(smallFont);
 		break;
+	case font_scaled:
+		setFont(scaledFont);
 	default:
 		break;
 	}

diff --git a/lib/framework/wzapp.h b/lib/framework/wzapp.h
@@ -71,7 +71,7 @@ class WzMainWindow : public QGLWidget
 	QCursor *cursors[CURSOR_MAX];
 	QTimer *timer;
 	QTime tickCount;
-	QFont regularFont, boldFont, smallFont;
+	QFont regularFont, boldFont, smallFont, scaledFont;
 	bool notReadyToPaint;  ///< HACK Don't draw during initial show(), since some global variables apparently aren't set up.
 	static WzMainWindow *myself;
 

diff --git a/lib/ivis_opengl/textdraw.h b/lib/ivis_opengl/textdraw.h
@@ -26,9 +26,10 @@
 
 enum iV_fonts
 {
-    font_regular,
-    font_large,
+	font_regular,
+	font_large,
 	font_small,
+	font_scaled,
 };
 
 extern void iV_TextInit(void);