X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;fp=bigscreen%2Ffonts.cpp;h=aa61303b61a997223eaf6139a09845422bd2b58a;hp=af9a9368ca2e06a02240c08a0710f0710ae575d8;hb=1f0419e8b9ad6225c901fdc9b272727547c08165;hpb=9c22e166f4d25f2d80766de9baab56efd9d952b0

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index af9a936..aa61303 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -38,10 +38,14 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 	int x = 0;
 	
 	for (std::vector<FT_Face>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-		if (FT_Set_Char_Size(*i, 0, unsigned(size * 64.0), 96, 96))
+		if (FT_Set_Char_Size(*i, 0, unsigned(size * 64.0), 96 * SCREEN_WIDTH/LOGICAL_SCREEN_WIDTH, 96 * SCREEN_HEIGHT/LOGICAL_SCREEN_HEIGHT))
 			throw std::runtime_error("Couldn't set font size");
 	}
 
+	// whoop :-P
+	xpos = xpos * SCREEN_WIDTH / LOGICAL_SCREEN_WIDTH;
+	ypos = ypos * SCREEN_HEIGHT / LOGICAL_SCREEN_HEIGHT;
+
 	for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
 		int glyph_index;
 		for (std::vector<FT_Face>::const_iterator j = fonts.begin(); j != fonts.end(); ++j) {
@@ -87,7 +91,7 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 		x += slot->advance.x >> 6;
 	}
 
-	return x;
+	return x * LOGICAL_SCREEN_WIDTH / SCREEN_WIDTH;
 }
 
 void my_draw_text_deferred(std::vector<TextDefer> &td, const widestring &str, double size, int xpos, int ypos)