Add font & settings. add some features.

Author: kaishuu0123

src/main/index.ts

@@ -48,7 +48,7 @@ function createWindow(): void {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(async () => {
   // Set app user model id for windows
-  electronApp.setAppUserModelId('com.electron')
+  electronApp.setAppUserModelId('me.saino.leavepad')
 
   const userDir = app.getPath('userData')
   const defaultData: Note[] = []

src/renderer/src/App.tsx

@@ -40,7 +40,7 @@ import {
 import { getTime } from 'date-fns'
 import { Trans, useTranslation } from 'react-i18next'
 import i18n from './i18n/configs'
-import { Drawer, DrawerClose, DrawerContent, DrawerTrigger } from './components/ui/drawer'
+import { Drawer, DrawerContent, DrawerTrigger } from './components/ui/drawer'
 import LogoImg from './assets/leavepad_logo.svg'
 
 initializeNoteEditor()
@@ -64,6 +64,7 @@ function App(): JSX.Element {
   const [globalSettingsOpen, setGlobalSettingsOpen] = useState(false)
   const [currentSearchValue, setCurrentSearchValue] = useState('')
   const [isSidebarOpen, setSidebarOpen] = useState(true)
+  const [isDrawerOpen, setDrawerOpen] = useState(false)
 
   const sortNotes = (unsortedNotes: Note[]) => {
     const sortBy = currentNoteEditorSettings.sortBy
@@ -146,6 +147,10 @@ function App(): JSX.Element {
   const onNoteCardClick = (note: Note) => {
     setCurrentNote(note)
 
+    if (isDrawerOpen === true) {
+      setDrawerOpen(false)
+    }
+
     const noteTab = noteTabs.find((tab) => tab.id === note.id)
     // Focus exists tab.
     if (noteTab) {
@@ -154,10 +159,6 @@ function App(): JSX.Element {
 
     // Add tab when not included noteTabs.
     setNoteTabs([...noteTabs, { id: note.id, name: note.name }])
-
-    if (editorRef.current != null) {
-      editorRef.current.focus()
-    }
   }
 
   const onNoteCardSetName = async (changedNote: Note, title: string) => {
@@ -312,7 +313,7 @@ function App(): JSX.Element {
                 </div>
               </ScrollArea>
             ) : (
-              <Drawer direction="left">
+              <Drawer direction="left" open={isDrawerOpen} onOpenChange={setDrawerOpen}>
                 <DrawerTrigger asChild>
                   <Button>
                     <div className="codicon codicon-note"></div>

src/renderer/src/assets/fonts/HackGen/HackGen-Regular.ttf

@@ -0,0 +1,5 @@
+@font-face {
+  font-family: 'HackGen';
+  src: url('./HackGen/HackGen-Regular.ttf') format('truetype');
+  font-weight: normal;
+}

src/renderer/src/assets/fonts/hackgen.css

@@ -2,6 +2,7 @@
 @import './fonts/geist-mono.css';
 @import './fonts/noto-sans.css';
 @import './fonts/noto-color-emoji.css';
+@import './fonts/hackgen.css';
 @import '../../../../node_modules/@vscode/codicons/dist/codicon.css';
 
 @tailwind base;

src/renderer/src/assets/index.css

@@ -54,7 +54,7 @@ function NoteEditor(
 ): JSX.Element {
   const [settings] = useAtom(currentNoteEditorSettingsAtom)
 
-  const handleEditorDidMount = (editor, _monaco) => {
+  const handleEditorDidMount = (monacoEditor, _monaco) => {
     if (ref == null) {
       return
     }
@@ -63,14 +63,18 @@ function NoteEditor(
     }
     // here is the editor instance
     // you can store it in `useRef` for further usage
-    ref.current = editor
+    ref.current = monacoEditor
 
     if (ref.current != null) {
       ref.current.onDidChangeCursorPosition(onDidChangeCursorPosition)
 
       // for DEBUG
       // @ts-ignore
-      window.editor = editor
+      window.editor = monacoEditor
+      // @ts-ignore
+      window.monaco = monaco
+
+      monaco.editor.remeasureFonts()
     }
   }
 

src/renderer/src/components/note-editor.tsx

@@ -58,7 +58,7 @@ export const defaultNoteEditorSettings: NoteEditorSettings = {
     useTabStops: false,
     wordWrap: 'off',
     fontFamily:
-      "Consolas, Menlo, Monaco, 'Courier New', 'Droid Sans Mono', 'monospace', monospace, 'Noto Sans JP', 'Noto Color Emoji'"
+      "HackGen, Consolas, Menlo, Monaco, 'Courier New', 'Droid Sans Mono', 'monospace', monospace, 'Noto Sans JP', 'Noto Color Emoji'"
   }
 }