From d4eab18648bea26ef348045e9eba0a651292c4c5 Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 13 Sep 2016 12:11:32 +0200 Subject: Allow for selecting and copying text (Fix #22) --- src/main/java/cuchaz/enigma/gui/BrowserCaret.java | 9 +-------- src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src/main/java/cuchaz') diff --git a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java b/src/main/java/cuchaz/enigma/gui/BrowserCaret.java index f9701f28..013778a2 100644 --- a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java +++ b/src/main/java/cuchaz/enigma/gui/BrowserCaret.java @@ -15,12 +15,9 @@ import javax.swing.text.Highlighter; public class BrowserCaret extends DefaultCaret { - private static final Highlighter.HighlightPainter selectionPainter = (g, p0, p1, bounds, c) -> { - }; - @Override public boolean isSelectionVisible() { - return false; + return true; } @Override @@ -28,8 +25,4 @@ public class BrowserCaret extends DefaultCaret { return true; } - @Override - public Highlighter.HighlightPainter getSelectionPainter() { - return this.selectionPainter; - } } diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java index 6eff81c5..9446869a 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 java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -16,6 +17,7 @@ public class PanelEditor extends JEditorPane { this.gui = gui; this.setEditable(false); + this.setSelectionColor(new Color(31, 46, 90)); this.setCaret(new BrowserCaret()); this.setContentType("text/java"); this.addCaretListener(event -> gui.onCaretMove(event.getDot())); -- cgit v1.2.3