Fix the font cache, use the right font in the editor. ALL GOOD FOR PR…

…IME TIME
fasterthanlime · Dec 21, 2011 · 99d935c · 99d935c
1 parent 5dad457
commit 99d935c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/source/game/Editor.ooc b/source/game/Editor.ooc
@@ -78,7 +78,8 @@ Editor: class extends Actor {
     paint: func (cr: Context) {
         if (ui mode != UIMode EDITOR) return
 
-        cr selectFontFace("Impact", CairoFontSlant NORMAL, CairoFontWeight NORMAL)
+	// that's ugly
+	cr setFontFace(LabelSprite cache get("assets/fonts/impact.ttf"))
         cr setSourceRGB(1.0, 0.3, 0.3)
         cr moveTo(100, 100)
         cr setFontSize(40.0)

diff --git a/source/ui/Sprite.ooc b/source/ui/Sprite.ooc
@@ -222,6 +222,7 @@ LabelSprite: class extends Sprite {
 		logger warn("Loading font failed, falling back on default font")
 	    } else {
 		font = newFontFromFreetype(ftFace, 0)
+		cache put(path, font)
 	    }
 	}