From c65069ab8a642a4ebdf7071e33014f8933caf458 Mon Sep 17 00:00:00 2001
From: Shadowfacts
Date: Mon, 10 Dec 2018 19:11:14 -0500
Subject: Fix cursor and selection highlight color when using the dark theme

---
 .../java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java | 4 +++-
 src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java             | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/main/java/cuchaz/enigma/gui')

diff --git a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
index 5cbeabc..81a70a9 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
@@ -11,6 +11,8 @@
 
 package cuchaz.enigma.gui.highlight;
 
+import cuchaz.enigma.config.Config;
+
 import javax.swing.text.Highlighter;
 import javax.swing.text.JTextComponent;
 import java.awt.*;
@@ -22,7 +24,7 @@ public class SelectionHighlightPainter implements Highlighter.HighlightPainter {
 		// draw a thick border
 		Graphics2D g2d = (Graphics2D) g;
 		Rectangle bounds = BoxHighlightPainter.getBounds(text, start, end);
-		g2d.setColor(Color.black);
+		g2d.setColor(new Color(Config.getInstance().selectionHighlightColor));
 		g2d.setStroke(new BasicStroke(2.0f));
 		g2d.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
 	}
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
index ffceae1..9b01631 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
@@ -1,5 +1,6 @@
 package cuchaz.enigma.gui.panels;
 
+import cuchaz.enigma.config.Config;
 import cuchaz.enigma.gui.BrowserCaret;
 import cuchaz.enigma.gui.Gui;
 
@@ -68,4 +69,9 @@ public class PanelEditor extends JEditorPane {
 			}
 		});
 	}
+
+	@Override
+	public Color getCaretColor() {
+		return new Color(Config.getInstance().caretColor);
+	}
 }
-- 
cgit v1.2.3