From 7ca770cbc3aee182855d31429d27fbb74f2156b9 Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Mon, 5 Oct 2020 18:50:45 +0200
Subject: [PATCH] Fix  Incorrect ChatScene Size on Startup (#79)

Additionally fixes error on message receival.
Fixes #68
Reviewed-on: https://git.kske.dev/zdm/envoy/pulls/79
Reviewed-by: kske <kai@kske.dev>
Reviewed-by: DieGurke <maxi@kske.dev>
---
 .../envoy/client/ui/controller/ChatScene.java  | 18 +++++++++---------
 client/src/main/resources/fxml/ChatScene.fxml  |  6 +++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

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 8ec0246..a8efa6c 100644
--- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -223,16 +223,16 @@ public final class ChatScene implements EventListener, Restorable {
 		final var	recipientID	= message instanceof GroupMessage || ownMessage ? message.getRecipientID() : message.getSenderID();
 
 		localDB.getChat(recipientID).ifPresent(chat -> {
-			chat.insert(message);
-
-			// Read current chat or increment unread amount
-			if (chat.equals(currentChat)) {
-				currentChat.read(writeProxy);
-				Platform.runLater(this::scrollToMessageListEnd);
-			} else if (!ownMessage && message.getStatus() != MessageStatus.READ) chat.incrementUnreadAmount();
-
-			// Move chat with most recent unread messages to the top
 			Platform.runLater(() -> {
+				chat.insert(message);
+
+				// Read current chat or increment unread amount
+				if (chat.equals(currentChat)) {
+					currentChat.read(writeProxy);
+					scrollToMessageListEnd();
+				} else if (!ownMessage && message.getStatus() != MessageStatus.READ) chat.incrementUnreadAmount();
+
+				// Move chat with most recent unread messages to the top
 				chats.getSource().remove(chat);
 				((ObservableList<Chat>) chats.getSource()).add(0, chat);
 
diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml
index e3de7aa..f557974 100644
--- a/client/src/main/resources/fxml/ChatScene.fxml
+++ b/client/src/main/resources/fxml/ChatScene.fxml
@@ -20,13 +20,17 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
+<?import javafx.stage.Screen?>
 
 <GridPane fx:id="scene" maxHeight="-Infinity"
 	maxWidth="-Infinity" minHeight="400.0" minWidth="500.0"
-	prefHeight="1152.0" prefWidth="2042.0"
+	prefHeight="${screen.visualBounds.height}" prefWidth="${screen.visualBounds.width}"
 	xmlns="http://javafx.com/javafx/11.0.1"
 	xmlns:fx="http://javafx.com/fxml/1"
 	fx:controller="envoy.client.ui.controller.ChatScene">
+	<fx:define>
+    	<Screen fx:factory="getPrimary" fx:id="screen" />
+	</fx:define>
 	<columnConstraints>
 		<ColumnConstraints hgrow="NEVER"
 			maxWidth="327.99997965494794" minWidth="-Infinity" prefWidth="317.0" />