michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added close button for keyBindingDialog.

Browse Source 
- fixed that you cannot bind the key you are using.

#story[1278] #pair[hyi25, zyt10]
This commit is contained in:
Zhi You Tan
2017-09-25 16:31:28 +13:00
parent 19db6668da
commit 191b818e38
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/GameKeyBind.java
+2 -1
View File
@@ -53,7 +53,8 @@ public class GameKeyBind {
* @return true if successfully bind
*/
public boolean bindKeyToAction(KeyCode keyCode, KeyAction keyAction) {
if (instance.keyToActionMap.containsKey(keyCode)) {
if (instance.keyToActionMap.containsKey(keyCode) && !(instance.keyToActionMap.get(keyCode)
== keyAction)) {
// if the key has been bound to other action, return false
return false;
} else {