rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-17 06:52:18 +01:00
Code Issues Releases Activity

Line highlighting setting was read from preferences while it's stored in theme.txt. Fixed and disabled line highlighting by default since no one has never seen it. Fixes #1228

Browse Source
This commit is contained in:
Federico Fissore 2015-07-03 11:58:18 +02:00
parent fc8d903c7d
commit 6258e02436
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/Editor.java
View File

@ -504,7 +504,7 @@ public class Editor extends JFrame implements RunnerListener {
} else {
textarea.setBackground(Theme.getColor("editor.bgcolor"));
textarea.setHighlightCurrentLine(PreferencesData.getBoolean("editor.linehighlight"));
textarea.setHighlightCurrentLine(Theme.getBoolean("editor.linehighlight"));
textarea.setEditable(true);
}

7
app/src/processing/app/syntax/SketchTextArea.java
View File

@ -32,13 +32,15 @@ package processing.app.syntax;
import org.apache.commons.compress.utils.IOUtils;
import org.fife.ui.rsyntaxtextarea.*;
import org.fife.ui.rsyntaxtextarea.Theme;
import org.fife.ui.rsyntaxtextarea.Token;
import org.fife.ui.rsyntaxtextarea.focusabletip.FocusableTip;
import org.fife.ui.rtextarea.RTextArea;
import org.fife.ui.rtextarea.RTextAreaUI;
import org.fife.ui.rtextarea.RUndoManager;
import processing.app.*;
import processing.app.Base;
import processing.app.BaseNoGui;
import processing.app.EditorListener;
import processing.app.PreferencesData;
import javax.swing.*;
import javax.swing.event.EventListenerList;
@ -107,6 +109,7 @@ public class SketchTextArea extends RSyntaxTextArea {
}
setBackground(processing.app.Theme.getColor("editor.bgcolor"));
setHighlightCurrentLine(processing.app.Theme.getBoolean("editor.linehighlight"));
setCurrentLineHighlightColor(processing.app.Theme.getColor("editor.linehighlight.color"));
setCaretColor(processing.app.Theme.getColor("editor.caret.color"));
setSelectedTextColor(null);

2
build/shared/lib/theme/theme.txt
View File

@ -50,7 +50,7 @@ editor.bgcolor = #ffffff
# highlight for the current line
editor.linehighlight.color=#e2e2e2
# highlight for the current line
editor.linehighlight=true
editor.linehighlight=false
# caret blinking and caret color
editor.caret.color = #333300