Skip to content

Commit ec0a2a6

Browse files
committed
Change default font to Verdana
1 parent c5c6d73 commit ec0a2a6

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

conf/editor_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
{
3-
"fontFamily":"'Dejavu Sans Mono'",
3+
"fontFamily": "Verdana",
44
"fontSize":16,
55
"scrollSpeed":0.1,
66
"useWrapMode":true,

src/main/java/com/kodedu/config/EditorConfigBean.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
import com.dooapp.fxform.handler.NamedFieldHandler;
88
import com.dooapp.fxform.view.factory.DefaultFactoryProvider;
99
import com.kodedu.component.SliderBuilt;
10-
import com.kodedu.config.factory.*;
10+
import com.kodedu.config.factory.FileChooserEditableFactory;
11+
import com.kodedu.config.factory.ListChoiceBoxFactory;
12+
import com.kodedu.config.factory.SliderFactory;
13+
import com.kodedu.config.factory.SpinnerFactory;
1114
import com.kodedu.controller.ApplicationController;
1215
import com.kodedu.helper.IOHelper;
1316
import com.kodedu.service.ThreadService;
@@ -514,10 +517,9 @@ public void load(Path configPath, ActionEvent... actionEvent) {
514517
setDetachedStagePositions(jsonObject);
515518

516519
String defaultFont = fontFamilies.stream()
517-
.filter(f -> Objects.equals(f, "Arial"))
520+
.filter(f -> Objects.equals(f, "Verdana"))
518521
.findFirst()
519-
.or(() -> fontFamilies.stream().filter(f -> Objects.equals(f, "Verdana")).findFirst())
520-
.or(() -> fontFamilies.stream().filter(f -> Objects.equals(f, "Calibri")).findFirst())
522+
.or(() -> fontFamilies.stream().filter(f -> Objects.equals(f, "Arial")).findFirst())
521523
.orElse(Font.getDefault().getFamily());
522524

523525
String aceDefaultFont = aceFontFamilies.stream()
@@ -526,7 +528,7 @@ public void load(Path configPath, ActionEvent... actionEvent) {
526528
.or(() -> aceFontFamilies.stream().filter(f -> f.contains("Consolas")).findFirst())
527529
.orElse("Monospaced");
528530

529-
String fontFamily = jsonObject.getString("fontFamily", defaultFont);
531+
String fontFamily = jsonObject.getString("generalFontFamily", defaultFont);
530532
String aceFontFamily = jsonObject.getString("aceFontFamily", aceDefaultFont);
531533
int aceFontSize = jsonObject.getInt("aceFontSize", 14);
532534
String aceTheme = jsonObject.getString("aceTheme", "xcode");
@@ -717,7 +719,7 @@ public JsonObject getJSON() {
717719
JsonObjectBuilder objectBuilder = Json.createObjectBuilder();
718720

719721
objectBuilder
720-
.add("fontFamily", getFontFamily().get(0))
722+
.add("generalFontFamily", getFontFamily().get(0))
721723
.add("aceFontFamily", getAceFontFamily().get(0))
722724
.add("aceFontSize", getAceFontSize())
723725
.add("scrollSpeed", getScrollSpeed())

0 commit comments

Comments
 (0)