From b23ee61506bca4fa3d574f8653a76ba8e1dd2653 Mon Sep 17 00:00:00 2001 From: delvh Date: Sun, 21 Jun 2020 17:04:27 +0200 Subject: [PATCH] Moved remainingCharsLabel styling from code to CSS --- src/main/java/envoy/client/ui/controller/ChatScene.java | 4 ---- src/main/resources/css/base.css | 6 ++++++ src/main/resources/fxml/ChatScene.fxml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java index bcfbcc3..0f8b0b0 100644 --- a/src/main/java/envoy/client/ui/controller/ChatScene.java +++ b/src/main/java/envoy/client/ui/controller/ChatScene.java @@ -85,10 +85,6 @@ public final class ChatScene { messageList.setCellFactory(listView -> new MessageListCell()); userList.setCellFactory(listView -> new ContactListCell()); - // Unfortunately, remainingChars.setTextFill(...) does not work as it is most - // likely overridden by CSS - remainingChars.setStyle("-fx-text-fill: #00FF00; -fx-opacity: 1; -fx-background-color: transparent;"); - // Listen to received messages eventBus.register(MessageCreationEvent.class, e -> { final var message = e.get(); diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css index aa2b6fb..43b5c3a 100644 --- a/src/main/resources/css/base.css +++ b/src/main/resources/css/base.css @@ -6,3 +6,9 @@ -fx-scale-x: 1.05; -fx-scale-y: 1.05; } + +#remainingCharsLabel { + -fx-text-fill: #00FF00; + -fx-opacity: 1; + -fx-background-color: transparent; +} diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml index 45067b4..9d95fba 100644 --- a/src/main/resources/fxml/ChatScene.fxml +++ b/src/main/resources/fxml/ChatScene.fxml @@ -76,7 +76,7 @@ -