cleaning up the names for highlight keys

This commit is contained in:
Ben Fry
2022-08-03 17:13:37 -04:00
parent 23b9cb1897
commit ed5a104fab
3 changed files with 14 additions and 15 deletions

View File

@@ -95,11 +95,11 @@ public class PdeTextAreaDefaults extends TextAreaDefaults {
caretColor = Theme.getColor("editor.caret.color");
selectionColor = Theme.getColor("editor.selection.color");
lineHighlight = Theme.getBoolean("editor.linehighlight");
lineHighlightColor = Theme.getColor("editor.linehighlight.color");
bracketHighlight = Theme.getBoolean("editor.brackethighlight");
bracketHighlightColor = Theme.getColor("editor.brackethighlight.color");
eolMarkers = Theme.getBoolean("editor.eolmarkers");
eolMarkerColor = Theme.getColor("editor.eolmarkers.color");
lineHighlight = Theme.getBoolean("editor.line.highlight");
lineHighlightColor = Theme.getColor("editor.line.highlight.color");
bracketHighlight = Theme.getBoolean("editor.bracket.highlight");
bracketHighlightColor = Theme.getColor("editor.bracket.highlight.color");
eolMarkers = Theme.getBoolean("editor.eol_markers");
eolMarkerColor = Theme.getColor("editor.eol_markers.color");
}
}

View File

@@ -419,7 +419,7 @@ public class ThemeSelector extends JFrame implements Tool {
StringDict replacements = new StringDict(new String[][] {
{ "#000000", entries.get("console.color") },
{ "#111111", entries.get("editor.gutter.linehighlight.color") },
{ "#111111", entries.get("editor.gutter.highlight.color") },
{ "#222222", entries.get("footer.gradient.top") },
{ "#444444", entries.get("mode.background.color") },
{ "#555555", entries.get("toolbar.button.enabled.glyph") },
@@ -427,7 +427,7 @@ public class ThemeSelector extends JFrame implements Tool {
{ "#777777", entries.get("editor.gradient.bottom") },
{ "#888888", entries.get("toolbar.button.selected.field") },
{ "#CCCCCC", entries.get("toolbar.button.enabled.field") },
{ "#DDDDDD", entries.get("editor.linehighlight.color") },
{ "#DDDDDD", entries.get("editor.line.highlight.color") },
{ "#EEEEEE", entries.get("toolbar.button.selected.glyph") },
{ "#FFFFFF", entries.get("editor.bgcolor") }
});

View File

@@ -137,21 +137,20 @@ editor.gradient.top = #6BA0CC
editor.gradient.bottom = #6BA0CC
# highlight for the current line
editor.linehighlight.color = #DEF3FF
# highlight for the current line
editor.linehighlight = true
editor.line.highlight = true
editor.line.highlight.color = #DEF3FF
editor.caret.color = #000000
# also used by EditorHeader
editor.selection.color = #BFD7EF
# little pooties at the end of lines that show where they finish
editor.eolmarkers = false
editor.eolmarkers.color = #999999
editor.eol_markers = false
editor.eol_markers.color = #999999
# bracket/brace highlighting
editor.brackethighlight = true
editor.brackethighlight.color = #006698
editor.bracket.highlight = true
editor.bracket.highlight.color = #006698
# colors for the custom scroll bar
editor.scrollbar.thumb.enabled.color = #3E76A0