Color in settings display

Changed files (3)

• modified libbirdfont/KeyBindings.vala
• modified libbirdfont/SettingsItem.vala
• modified libbirdfont/TabContent.vala

Diff

diff --git a/libbirdfont/KeyBindings.vala b/libbirdfont/KeyBindings.valaindex 7c319ac..de7a15f 100644--- a/libbirdfont/KeyBindings.vala+++ b/libbirdfont/KeyBindings.vala@@ -96,6 +96,10 @@ public class KeyBindings {  	public static bool require_modifier; +	public uint get_modifiers () {+		return modifier;+	}+ 	public static void reset () { 		modifier = NONE; 		modifier_ctrl = false;@@ -116,9 +120,7 @@ public class KeyBindings { 	}  	public static void remove_modifier_from_keyval (uint keyval) {-		uint mod;-				-		mod = get_mod_from_key (keyval);+		uint mod = get_mod_from_key (keyval); 		set_modifier (modifier ^ mod);		 	} diff --git a/libbirdfont/SettingsItem.vala b/libbirdfont/SettingsItem.valaindex de942d0..7bf6588 100644--- a/libbirdfont/SettingsItem.vala+++ b/libbirdfont/SettingsItem.vala@@ -88,7 +88,7 @@ class SettingsItem : GLib.Object { 			} 			 			cr.save ();-			cr.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1);+			label.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1); 			label.set_font_size (17 * MainWindow.units); 			label.draw_at_baseline (cr, label_x, y + 20 * MainWindow.units); 			cr.restore ();@@ -99,9 +99,9 @@ class SettingsItem : GLib.Object { 				cr.save (); 				 				if (active) {-					cr.set_source_rgba (1, 1, 1, 1);+					key_binding_text.set_source_rgba (1, 1, 1, 1); 				} else {-					cr.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1);+					key_binding_text.set_source_rgba (101 / 255.0, 108 / 255.0, 116 / 255.0, 1); 				} 				 				key_binding_text.set_font_size (17 * MainWindow.units);diff --git a/libbirdfont/TabContent.vala b/libbirdfont/TabContent.valaindex 4dec1e4..3ff4d66 100644--- a/libbirdfont/TabContent.vala+++ b/libbirdfont/TabContent.vala@@ -82,8 +82,9 @@ public class TabContent : GLib.Object { 		if (MenuTab.suppress_event) { 			return; 		}-+		 		KeyBindings.add_modifier_from_keyval (keyval);+		 		MainWindow.get_menu ().process_key_binding_events (keyval); 		GlyphCanvas.current_display.key_press (keyval); 	}