Merge branch 'stable-2.14'

* stable-2.14:
  Add support for CodeEditor edit config indentWithTabs
  Change lineWrapping from saying false to using prefs.lineWrapping()

Change-Id: I4a94a9179f780a9b31c802478209075c102e7a55
This commit is contained in:
Paladox
2017-07-02 18:43:21 +01:00
7 changed files with 34 additions and 1 deletions

View File

@@ -27,6 +27,7 @@ public class EditPreferencesInfo {
public Boolean hideLineNumbers;
public Boolean matchBrackets;
public Boolean lineWrapping;
public Boolean indentWithTabs;
public Boolean autoCloseBrackets;
public Boolean showBase;
public Theme theme;
@@ -45,6 +46,7 @@ public class EditPreferencesInfo {
i.hideLineNumbers = false;
i.matchBrackets = true;
i.lineWrapping = false;
i.indentWithTabs = false;
i.autoCloseBrackets = false;
i.showBase = false;
i.theme = Theme.DEFAULT;