Merge pull request #909 from AtomicGameEngine/TSH-ATOMIC-MONACO-FONTFAMILY

Expose fontFamily to the monaco editor prefs

Script/AtomicEditor/editor/Preferences.ts

@@ -293,6 +293,7 @@ interface WindowData {
 interface MonacoEditorSettings {
     theme: string;
     fontSize: number;
+    fontFamily: string;
     showInvisibles: boolean;
     useSoftTabs: boolean;
     tabSize: number;
@@ -343,6 +344,7 @@ class PreferencesFormat {
         this.codeEditor = {
             theme: "vs-dark",
             fontSize: 12,
+            fontFamily: "",
             showInvisibles: false,
             useSoftTabs: true,
             tabSize: 4

Script/AtomicWebViewEditor/editor/editorCommands.ts

@@ -37,7 +37,8 @@ export function configure(fileExt: string, filename: string) {
         theme: serviceLocator.clientServices.getApplicationPreference("codeEditor", "theme", "vs-dark"),
         renderWhitespace: serviceLocator.clientServices.getApplicationPreference("codeEditor", "showInvisibles", false),
         mouseWheelScrollSensitivity: 2,
-        fontSize: serviceLocator.clientServices.getApplicationPreference("codeEditor", "fontSize", 12)
+        fontSize: serviceLocator.clientServices.getApplicationPreference("codeEditor", "fontSize", 12),
+        fontFamily: serviceLocator.clientServices.getApplicationPreference("codeEditor", "fontFamily", "")
     });
 
     // give the language extensions the opportunity to configure the editor based upon the file type

Script/AtomicWebViewEditor/tsconfig.json

@@ -12,7 +12,8 @@
     "filesGlob": [
         "./**/*.ts",
         "../TypeScript/*.ts",
-        "!../TypeScript/dist/*.ts"
+        "!../TypeScript/dist/*.ts",
+        "!../TypeScript/AtomicNET.d.ts"
     ],
     "atom": {
         "rewriteTsconfig": true

Script/tsconfig.json

@@ -15,7 +15,8 @@
         "./ToolCore/**/*.ts",
         "./AtomicEditor/**/*.ts",
         "./TypeScript/**/*.ts",
-        "!./TypeScript/dist/*.ts"
+        "!./TypeScript/dist/*.ts",
+        "!./TypeScript/AtomicNET.d.ts"
     ],
     "atom": {
         "rewriteTsconfig": true