From 3bd0aff8ef64cc93d80f8e8714d56c3112b0fc91 Mon Sep 17 00:00:00 2001
From: Alexis Durgnat <alexis.durgnat@etu.hesge.ch>
Date: Sun, 3 Feb 2019 11:11:59 +0100
Subject: [PATCH] Extracted color of chat message in parameters
---
src/main/java/ch/hepia/ui/MainWindowController.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index 59b381a..bcd829c 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -156,9 +156,9 @@ public class MainWindowController implements Initializable {
* Draws a newly received message
* @param message The message to draw
*/
- private void drawMessage(User user, String message, String image){
+ private void drawMessage(User user, String message, String image, Color color){
Pane p = new Pane();
- setChatPanelStyle(p);
+ setChatPanelStyle(p, color);
Image lblImg = new Image(Main.class.getResourceAsStream(image));
Label msg = new Label();
msg.setWrapText(true);
@@ -174,13 +174,13 @@ public class MainWindowController implements Initializable {
chatContainer.getChildren().add(p);
}
- private void setChatPanelStyle(Pane p) {
+ private void setChatPanelStyle(Pane p, Color color) {
p.setBackground(
new Background(
new BackgroundFill(
new LinearGradient(0, 0, 0, 1, true,
CycleMethod.NO_CYCLE,
- new Stop(1, AppConfig.COLOR_BLUE_10_OPACITY),
+ new Stop(1, color),
new Stop(0, Color.WHITE)
),
new CornerRadii(5),
@@ -265,7 +265,7 @@ public class MainWindowController implements Initializable {
chatMessage -> {
Platform.runLater(() -> {
String message = chatMessage.getUser().toString() + ": " + chatMessage.getMessage();
- drawMessage(chatMessage.getUser(), message, AppConfig.CHAT_MESSAGE_ICON);
+ drawMessage(chatMessage.getUser(), message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
});
},
chatMessage -> !(app.getUser().get().getIgnoredUserList().contains(chatMessage.getUser()))
--
GitLab