From ba048c58c4a600d684914ae463d59eeaa3284550 Mon Sep 17 00:00:00 2001
From: Peter Mucha <peter.mucha@adevinta.com>
Date: Thu, 29 Feb 2024 09:54:35 +0100
Subject: [PATCH] minor codearea UX tweaks

---
 milkman/pom.xml                                               | 2 +-
 .../src/main/java/milkman/ui/components/ContentEditor.java    | 3 +++
 milkman/src/main/sass/themes/_template-dark.scss              | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/milkman/pom.xml b/milkman/pom.xml
index c07e284d..652ba9f4 100644
--- a/milkman/pom.xml
+++ b/milkman/pom.xml
@@ -96,7 +96,7 @@
 		<dependency>
 			<groupId>org.fxmisc.richtext</groupId>
 			<artifactId>richtextfx</artifactId>
-			<version>0.11.0</version>
+			<version>0.11.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/milkman/src/main/java/milkman/ui/components/ContentEditor.java b/milkman/src/main/java/milkman/ui/components/ContentEditor.java
index 85bf6982..0071a3f0 100644
--- a/milkman/src/main/java/milkman/ui/components/ContentEditor.java
+++ b/milkman/src/main/java/milkman/ui/components/ContentEditor.java
@@ -31,6 +31,7 @@
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.Caret;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 import org.fxmisc.richtext.model.StyleSpans;
@@ -113,6 +114,8 @@ public ContentEditor() {
 
 	private void setupCodeArea() {
 		codeArea = new CodeArea();
+		//always show caret, even for non-editable
+		codeArea.setShowCaret(Caret.CaretVisibility.ON);
 //		codeArea.setWrapText(true);
 		setupParagraphGraphics();
 		EventStream<Object> highLightTrigger = EventStreams.merge(codeArea.multiPlainChanges(),
diff --git a/milkman/src/main/sass/themes/_template-dark.scss b/milkman/src/main/sass/themes/_template-dark.scss
index b5f7979a..f9f4da27 100644
--- a/milkman/src/main/sass/themes/_template-dark.scss
+++ b/milkman/src/main/sass/themes/_template-dark.scss
@@ -493,6 +493,10 @@
 	.code-area {
 		-fx-text-fill: $foreground;
 		-fx-background-color: darken($background, 10%);
+
+		.caret {
+			-fx-stroke: $foreground;
+		}
 	}
 	.list-cell {
 		-fx-text-fill: $foreground;