dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-27 02:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

configurable editor font #308

Browse Source
This commit is contained in:
Jan Prochazka
2022-07-17 17:26:58 +02:00
parent 62c2b3f5f4
commit c426cd825f
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/web/src/query/AceEditor.svelte
View File

@@ -114,7 +114,13 @@
import 'ace-builds/src-noconflict/theme-tomorrow_night'; import 'ace-builds/src-noconflict/theme-tomorrow_night';
import 'ace-builds/src-noconflict/theme-twilight'; import 'ace-builds/src-noconflict/theme-twilight';
import { currentDropDownMenu, currentEditorFontSize, currentEditorTheme, currentThemeDefinition } from '../stores'; import {
currentDropDownMenu,
currentEditorFontSize,
currentEditorFont,
currentEditorTheme,
currentThemeDefinition,
} from '../stores';
import _ from 'lodash'; import _ from 'lodash';
import { handleCommandKeyDown } from '../commands/CommandListener.svelte'; import { handleCommandKeyDown } from '../commands/CommandListener.svelte';
import resizeObserver from '../utility/resizeObserver'; import resizeObserver from '../utility/resizeObserver';
@@ -223,12 +229,15 @@
} }
} }
$: watchOptions(options); $: watchOptions(options, $currentEditorFont);
function watchOptions(newOption: any) { function watchOptions(newOption: any, fontFamily) {
if (editor) { if (editor) {
editor.setOptions({ editor.setOptions({
...stdOptions, ...stdOptions,
...newOption, ...newOption,
fontFamily: fontFamily || 'Menlo, Monaco, Ubuntu Mono, Consolas, source-code-pro, monospace',
// fontFamily: 'tahoma,Menlo',
// fontSize: '10pt',
}); });
} }
} }

8
packages/web/src/settings/SettingsModal.svelte
View File

@@ -127,7 +127,7 @@ ORDER BY
<div class="heading">Editor theme</div> <div class="heading">Editor theme</div>
<div class="flex"> <div class="flex">
<div class="col-6"> <div class="col-4">
<FormFieldTemplateLarge label="Theme" type="combo"> <FormFieldTemplateLarge label="Theme" type="combo">
<SelectField <SelectField
isNative isNative
@@ -139,7 +139,7 @@ ORDER BY
</FormFieldTemplateLarge> </FormFieldTemplateLarge>
</div> </div>
<div class="col-6"> <div class="col-4">
<FormFieldTemplateLarge label="Font size " type="combo"> <FormFieldTemplateLarge label="Font size " type="combo">
<SelectField <SelectField
isNative isNative
@@ -150,6 +150,10 @@ ORDER BY
/> />
</FormFieldTemplateLarge> </FormFieldTemplateLarge>
</div> </div>
<div class="col-4">
<FormTextField name="editor.fontFamily" label="Editor font family" />
</div>
</div> </div>
<div class="editor"> <div class="editor">

1
packages/web/src/stores.ts
View File

@@ -68,6 +68,7 @@ export const currentEditorTheme = getElectron()
export const currentEditorFontSize = getElectron() export const currentEditorFontSize = getElectron()
? writableSettingsValue(null, 'currentEditorFontSize') ? writableSettingsValue(null, 'currentEditorFontSize')
: writableWithStorage(null, 'currentEditorFontSize'); : writableWithStorage(null, 'currentEditorFontSize');
export const currentEditorFont = writableSettingsValue(null, 'editor.fontFamily');
export const activeTabId = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)?.tabid); export const activeTabId = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)?.tabid);
export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)); export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected));
export const recentDatabases = writableWithStorage([], 'recentDatabases'); export const recentDatabases = writableWithStorage([], 'recentDatabases');