Load default font

Changed files (2)

• modified libbirdfont/KeyBindings.vala
• modified libbirdfont/Renderer/Text.vala

Diff

diff --git a/libbirdfont/KeyBindings.vala b/libbirdfont/KeyBindings.valaindex de7a15f..c8982b4 100644--- a/libbirdfont/KeyBindings.vala+++ b/libbirdfont/KeyBindings.vala@@ -96,7 +96,7 @@ public class KeyBindings {  	public static bool require_modifier; -	public uint get_modifiers () {+	public static uint get_modifiers () { 		return modifier; 	} @@ -120,8 +120,8 @@ public class KeyBindings { 	}  	public static void remove_modifier_from_keyval (uint keyval) {-		uint mod = get_mod_from_key (keyval);-		set_modifier (modifier ^ mod);		+		uint mod = 0xFFFFFF ^ get_mod_from_key (keyval);+		set_modifier (modifier & mod); 	}  	public static void add_modifier_from_keyval (uint keyval) {diff --git a/libbirdfont/Renderer/Text.vala b/libbirdfont/Renderer/Text.valaindex 88bc6b8..9cfe9a8 100644--- a/libbirdfont/Renderer/Text.vala+++ b/libbirdfont/Renderer/Text.vala@@ -22,11 +22,7 @@ public class Text : Widget { 	public Font font { 		get { 			if (current_font == null) {-				File path = SearchPaths.find_file (null, "roboto.bf");-				current_font = new Font ();-				if (!load_font ((!) path.get_path ())) {-					current_font =  new Font ();-				}+				load_default_font (); 			} 			 			return (!) current_font;@@ -71,6 +67,13 @@ public class Text : Widget { 		set_text (text); 	} +	public static void load_default_font () {+		File path = SearchPaths.find_file (null, "roboto.bf");+		if (FontCache.get_default_cache ().get_font ((!) path.get_path ()) == null) {+			warning ("Default font not found.");+		}+	}+ 	public void set_font_size (double height_in_pixels) { 		font_size = height_in_pixels; 		sidebearing_extent = 0;