rename console lines pref to avoid name collision (fixes #5110)

This commit is contained in:
Ben Fry
2017-06-15 12:10:11 -04:00
parent 18a64d1b30
commit 1974a49790
3 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -69,8 +69,8 @@ public class EditorConsole extends JScrollPane {
public EditorConsole(Editor editor) {
this.editor = editor;
maxLineCount = Preferences.getInteger("console.lines");
maxCharCount = Preferences.getInteger("console.chars");
maxLineCount = Preferences.getInteger("console.scrollback.lines");
maxCharCount = Preferences.getInteger("console.scrollback.chars");
consoleDoc = new BufferedStyledDocument(10000, maxLineCount, maxCharCount);
consoleTextPane = new JTextPane(consoleDoc);
+2 -2
View File
@@ -182,8 +182,8 @@ console.auto_clear = true
# set the maximum number of lines remembered by the console
# the default is 500, lengthen at your own peril
console.lines = 500
console.chars = 40000
console.scrollback.lines = 500
console.scrollback.chars = 40000
# Any additional Java options when running.
# If you change this and can't run things, it's your own durn fault.
+3
View File
@@ -10,6 +10,9 @@ _ https://github.com/processing/processing/issues/5111
_ display=-1 regression? ("could not parse" message)
_ https://github.com/processing/processing/issues/5118
_ detect errors from curved quotation marks
_ https://github.com/processing/processing/issues/5133
contrib
_ console hiding button?
_ https://github.com/processing/processing/pull/5115