Skip to content

Commit f426188

Browse files
ricardojlrufinoFederico Fissore
authored and
Federico Fissore
committed
Add 'Code Folding' preferences and fix Font-Size changes
1 parent 1e61cd6 commit f426188

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

app/src/processing/app/Editor.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,10 @@ protected void applyPreferences() {
451451
saveAsMenuItem.setEnabled(!external);
452452

453453
scrollPane.setLineNumbersEnabled(PreferencesData.getBoolean("editor.linenumbers"));
454+
455+
textarea.setTheme(PreferencesData.get("editor.syntax_theme"));
456+
457+
textarea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding"));
454458

455459
if (external) {
456460
// disable line highlight and turn off the caret when disabling
@@ -479,8 +483,7 @@ protected void applyPreferences() {
479483
//sketchbook.rebuildMenus();
480484
// For 0126, moved into Base, which will notify all editors.
481485
//base.rebuildMenusAsync();
482-
483-
textarea.setTheme(Preferences.get("editor.syntax_theme"));
486+
484487
}
485488

486489

app/src/processing/app/Preferences.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public String toString() {
222222
JCheckBox verboseCompilationBox;
223223
JCheckBox verboseUploadBox;
224224
JCheckBox displayLineNumbersBox;
225+
JCheckBox enableCodeFoldingBox;
225226
JCheckBox verifyUploadBox;
226227
JCheckBox externalEditorBox;
227228
JCheckBox checkUpdatesBox;
@@ -423,6 +424,15 @@ public void actionPerformed(ActionEvent e) {
423424
right = Math.max(right, left + d.width);
424425
top += d.height + GUI_BETWEEN;
425426

427+
// [ ] Enable Code Folding
428+
429+
enableCodeFoldingBox = new JCheckBox(_("Enable Code Folding"));
430+
pane.add(enableCodeFoldingBox);
431+
d = enableCodeFoldingBox.getPreferredSize();
432+
enableCodeFoldingBox.setBounds(left, top, d.width + 10, d.height);
433+
right = Math.max(right, left + d.width);
434+
top += d.height + GUI_BETWEEN;
435+
426436
// [ ] Verify code after upload
427437

428438
verifyUploadBox = new JCheckBox(_("Verify code after upload"));
@@ -745,6 +755,7 @@ protected void applyFrame() {
745755
PreferencesData.setBoolean("build.verbose", verboseCompilationBox.isSelected());
746756
PreferencesData.setBoolean("upload.verbose", verboseUploadBox.isSelected());
747757
PreferencesData.setBoolean("editor.linenumbers", displayLineNumbersBox.isSelected());
758+
PreferencesData.setBoolean("editor.code_folding", enableCodeFoldingBox.isSelected());
748759
PreferencesData.setBoolean("upload.verify", verifyUploadBox.isSelected());
749760
PreferencesData.setBoolean("editor.save_on_verify", saveVerifyUploadBox.isSelected());
750761

@@ -836,6 +847,7 @@ protected void showFrame(Editor editor) {
836847
verboseCompilationBox.setSelected(PreferencesData.getBoolean("build.verbose"));
837848
verboseUploadBox.setSelected(PreferencesData.getBoolean("upload.verbose"));
838849
displayLineNumbersBox.setSelected(PreferencesData.getBoolean("editor.linenumbers"));
850+
enableCodeFoldingBox.setSelected(PreferencesData.getBoolean("editor.code_folding"));
839851
verifyUploadBox.setSelected(PreferencesData.getBoolean("upload.verify"));
840852

841853
//closingLastQuitsBox.

build/shared/lib/preferences.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ editor.window.height.min = 290
8787
#editor.window.height.min.windows = 530
8888

8989
# Syntax coloring ( on lib/theme/syntax )
90-
editor.syntax_theme = default
90+
editor.syntax_theme=default
91+
92+
# Enable code folding
93+
editor.code_folding=true
9194

9295
# font size for editor
9396
editor.font=Monospaced,plain,12

0 commit comments

Comments
 (0)