Avoid conflicting key bindings

Changed files (1)

• modified libbirdfont/SettingsDisplay.vala

Diff

diff --git a/libbirdfont/SettingsDisplay.vala b/libbirdfont/SettingsDisplay.valaindex 3f52085..363b39f 100644--- a/libbirdfont/SettingsDisplay.vala+++ b/libbirdfont/SettingsDisplay.vala@@ -304,6 +304,8 @@ public class SettingsDisplay : FontDisplay { 	}  	public override void key_release (uint keyval) {+		SettingsItem old_key_binding;+		 		if (update_key_bindings) { 			if (keyval == Key.BACK_SPACE) { 				update_key_bindings = false;@@ -311,6 +313,13 @@ public class SettingsDisplay : FontDisplay { 				new_key_bindings.menu_item.modifiers = NONE; 				new_key_bindings.menu_item.key = '\0';	 			} else if (KeyBindings.get_mod_from_key (keyval) == NONE) {+				+				if (has_key_binding (KeyBindings.modifier, (unichar) keyval)) {+					old_key_binding = (!) get_key_binding (KeyBindings.modifier, (unichar) keyval);+					old_key_binding.menu_item.modifiers = NONE;+					old_key_binding.menu_item.key = '\0';+				}+				 				new_key_bindings.menu_item.modifiers = KeyBindings.modifier; 				new_key_bindings.menu_item.key = (unichar) keyval; 				update_key_bindings = false;@@ -322,6 +331,20 @@ public class SettingsDisplay : FontDisplay { 		} 	} +	bool has_key_binding (uint modifier, unichar key) {+		return get_key_binding (modifier, key) != null;+	}+	+	SettingsItem? get_key_binding (uint modifier, unichar key) {+		foreach (SettingsItem i in tools) {+			if (i.menu_item.modifiers == modifier && i.menu_item.key == key) {+				return i;+			}+		}+		+		return null; +	}+ 	public override void button_press (uint button, double x, double y) { 		foreach (SettingsItem s in tools) { 			if (s.handle_events && s.button != null) {