zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Fixed bug not enabling the post-button when an attachment is present

Browse Source
This commit is contained in:
delvh 2020-07-16 18:23:06 +02:00
parent c0f4a8e212
commit 176f6c6463
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/envoy/client/ui/controller/ChatScene.java
View File

@ -355,6 +355,7 @@ public final class ChatScene implements Restorable {
try { try {
final var fileBytes = Files.readAllBytes(file.toPath()); final var fileBytes = Files.readAllBytes(file.toPath());
pendingAttachment = new Attachment(fileBytes, type); pendingAttachment = new Attachment(fileBytes, type);
checkPostConditions(false);
// Setting the preview image as image of the attachmentView // Setting the preview image as image of the attachmentView
if (type == AttachmentType.PICTURE) if (type == AttachmentType.PICTURE)
attachmentView.setImage(new Image(new ByteArrayInputStream(fileBytes), DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE, true, true)); attachmentView.setImage(new Image(new ByteArrayInputStream(fileBytes), DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE, true, true));
@ -413,9 +414,9 @@ public final class ChatScene implements Restorable {
|| !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown()); || !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown());
} }
private void checkPostConditions(boolean sendKeyPressed) { private void checkPostConditions(boolean postMessage) {
if (!postingPermanentlyDisabled) { if (!postingPermanentlyDisabled) {
if (!postButton.isDisabled() && sendKeyPressed) postMessage(); if (!postButton.isDisabled() && postMessage) postMessage();
postButton.setDisable(messageTextArea.getText().isBlank() && pendingAttachment == null || currentChat == null); postButton.setDisable(messageTextArea.getText().isBlank() && pendingAttachment == null || currentChat == null);
} else { } else {
final var noMoreMessaging = "Go online to send messages"; final var noMoreMessaging = "Go online to send messages";