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

- Fixed a bug in new customize dialog.

Browse Source 
- Chat should work correctly when pressing enter now.

tags : #story[1245]
This commit is contained in:
Alistair McIntyre
2017-09-12 17:26:52 +12:00
parent 90a54beb8d
commit 20b656b16d
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/LobbyController.java
+1
View File
@@ -128,6 +128,7 @@ public class LobbyController implements Initializable {
BoatCustomizeController controller = dialog.getController(); BoatCustomizeController controller = dialog.getController();
controller.setParentController(this); controller.setParentController(this);
controller.setPlayerColor(this.playersColor);
return customizationDialog; return customizationDialog;
} }
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+1 -2
View File
@@ -727,8 +727,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
} }
public boolean isChatInputFocused() { public boolean isChatInputFocused() {
// return chatInput.focusedProperty().getValue(); return chatInput.focusedProperty().getValue();
return false;
} }
public String readChatInput() { public String readChatInput() {
src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
-2
View File
@@ -43,8 +43,6 @@ public class BoatCustomizeController implements Initializable{
submitCustomization(); submitCustomization();
}); });
setPlayerColor(lobbyController.playersColor);
socketThread = ViewManager.getInstance().getGameClient().getServerThread(); socketThread = ViewManager.getInstance().getGameClient().getServerThread();
RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator(); RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator();