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

Merge branch 'f/enhanced_UI' of git@github.com:informatik-ag-ngl/envoy-client.git into f/enhanced_UI

Browse Source
This commit is contained in:
delvh 2020-06-26 17:33:49 +02:00
commit a57f14aca3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/envoy/client/ui/ContactListCell.java
View File

@ -39,7 +39,10 @@ public class ContactListCell extends ListCell<Contact> {
final var statusLabel = new Label(user.getStatus().toString()); final var statusLabel = new Label(user.getStatus().toString());
statusLabel.getStyleClass().add(user.getStatus().toString().toLowerCase()); statusLabel.getStyleClass().add(user.getStatus().toString().toLowerCase());
vbox.getChildren().add(statusLabel); vbox.getChildren().add(statusLabel);
} else vbox.getChildren().add(new Label(((Group) contact).getContacts().size() + " members")); } else {
// Member count
vbox.getChildren().add(new Label(((Group) contact).getContacts().size() + " members"));
}
setGraphic(vbox); setGraphic(vbox);
} }
} }

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

@ -322,7 +322,7 @@ public final class ChatScene {
*/ */
private void scrollToMessageListEnd() { messageList.scrollTo(messageList.getItems().size() - 1); } private void scrollToMessageListEnd() { messageList.scrollTo(messageList.getItems().size() - 1); }
// =========== contextMenu actions ========== // // Context menu actions
@FXML @FXML
private void copyMessage() { private void copyMessage() {
@ -354,5 +354,4 @@ public final class ChatScene {
updateRemainingCharsLabel(); updateRemainingCharsLabel();
postButton.setDisable(messageText.isBlank()); postButton.setDisable(messageText.isBlank());
} }
} }