diff --git a/client/src/main/java/envoy/client/ui/controller/ChatScene.java b/client/src/main/java/envoy/client/ui/controller/ChatScene.java index c7d6034..b118f8c 100644 --- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java +++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java @@ -107,9 +107,6 @@ public final class ChatScene implements EventListener, Restorable { @FXML private TextArea contactSearch; - @FXML - private VBox contactOperations; - @FXML private TabPane tabPane; @@ -125,9 +122,6 @@ public final class ChatScene implements EventListener, Restorable { @FXML private HBox ownContactControl; - @FXML - private Region spaceBetweenUserAndSettingsButton; - private Chat currentChat; private FilteredList chats; private Attachment pendingAttachment; @@ -175,7 +169,7 @@ public final class ChatScene implements EventListener, Restorable { // Set the icons of buttons and image views settingsButton.setGraphic( - new ImageView(IconUtil.loadIconThemeSensitive("settings", DEFAULT_ICON_SIZE))); + new ImageView(IconUtil.loadIconThemeSensitive("settings", 22))); voiceButton.setGraphic( new ImageView(IconUtil.loadIconThemeSensitive("microphone", DEFAULT_ICON_SIZE))); attachmentButton.setGraphic( @@ -195,7 +189,6 @@ public final class ChatScene implements EventListener, Restorable { chatList.setItems(chats = new FilteredList<>(localDB.getChats())); // Set the design of the box in the upper-left corner - settingsButton.setAlignment(Pos.BOTTOM_RIGHT); generateOwnStatusControl(); Platform.runLater(() -> { @@ -797,15 +790,15 @@ public final class ChatScene implements EventListener, Restorable { private void generateOwnStatusControl() { // Update the own user status if present - if (ownContactControl.getChildren().get(0) instanceof ContactControl) - ((ContactControl) ownContactControl.getChildren().get(0)).replaceInfoLabel(); + if (ownContactControl.getChildren().get(1) instanceof ContactControl) + ((ContactControl) ownContactControl.getChildren().get(1)).replaceInfoLabel(); else { // Else prepend it to the HBox children final var ownUserControl = new ContactControl(localDB.getUser()); ownUserControl.setAlignment(Pos.CENTER_LEFT); HBox.setHgrow(ownUserControl, Priority.NEVER); - ownContactControl.getChildren().add(0, ownUserControl); + ownContactControl.getChildren().add(1, ownUserControl); } } diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml index d61325c..f293d3e 100644 --- a/client/src/main/resources/fxml/ChatScene.fxml +++ b/client/src/main/resources/fxml/ChatScene.fxml @@ -57,7 +57,7 @@ - - + - - - - - - + +