Browse Source

Expose "fontFamily" setting to the monaco editor

Shaddock Heath 9 years ago
parent
commit
2fc2f72c12

+ 2 - 0
Script/AtomicEditor/editor/Preferences.ts

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

+ 2 - 1
Script/AtomicWebViewEditor/editor/editorCommands.ts

@@ -37,7 +37,8 @@ export function configure(fileExt: string, filename: string) {
         theme: serviceLocator.clientServices.getApplicationPreference("codeEditor", "theme", "vs-dark"),
         theme: serviceLocator.clientServices.getApplicationPreference("codeEditor", "theme", "vs-dark"),
         renderWhitespace: serviceLocator.clientServices.getApplicationPreference("codeEditor", "showInvisibles", false),
         renderWhitespace: serviceLocator.clientServices.getApplicationPreference("codeEditor", "showInvisibles", false),
         mouseWheelScrollSensitivity: 2,
         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
     // give the language extensions the opportunity to configure the editor based upon the file type