Merge pull request #45 from tw4/dev

fix: log tab titile trim error on macos
tw4 · Sep 29, 2024 · 1d719b2 · 1d719b2
2 parents e427518 + 40eeb30
commit 1d719b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -3,6 +3,7 @@ import { join } from 'path'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import icon from '../../resources/icon.png?asset'
 import registerHandlers from './handlers'
+import { promises } from 'dns'
 
 function createWindow(): void {
   // Create the browser window.
@@ -52,6 +53,10 @@ app.whenReady().then(() => {
     optimizer.watchWindowShortcuts(window)
   })
 
+  if (process.platform === 'darwin') {
+    app.dock.setIcon(icon)
+  }
+
   // IPC test
   ipcMain.on('ping', () => console.log('pong'))
   registerHandlers()

diff --git a/src/renderer/src/Pages/Home.tsx b/src/renderer/src/Pages/Home.tsx
@@ -40,6 +40,10 @@ export default function Home(): JSX.Element {
       const pathsArray = JSON.parse(paths)
       setTotalPathsCount(pathsArray.length)
 
+      window.electron.ipcRenderer.invoke('platform').then(async (res) => {
+        localStorage.setItem('platform', res)
+      })
+
       // get paths
       const data: Path[] = paths ? JSON.parse(paths) : []
       setPaths(data)

diff --git a/src/renderer/src/Pages/Log.tsx b/src/renderer/src/Pages/Log.tsx
@@ -9,7 +9,6 @@ type TargetKey = React.MouseEvent | React.KeyboardEvent | string
 export default function Log(): JSX.Element {
   const newTabIndex = useRef(0)
   const [selectedFile, setSelectedFile] = useState<string[]>([])
-  const [platform, setPlatform] = useState<string>('')
   const initialItems = [
     {
       label: <Tooltip title="File List">File List</Tooltip>,
@@ -20,12 +19,6 @@ export default function Log(): JSX.Element {
   const [activeKey, setActiveKey] = useState(initialItems[0].key)
   const [items, setItems] = useState(initialItems)
 
-  useEffect(() => {
-    window.electron.ipcRenderer.invoke('platform').then((res) => {
-      setPlatform(res)
-    })
-  }, [])
-
   // initial items
   // useState side
   const onChange = (newActiveKey: string): void => {
@@ -62,7 +55,6 @@ export default function Log(): JSX.Element {
   ): void => {
     if (action === 'add') {
       selectedFile.forEach((fileName) => {
-        console.log(fileName)
         add(fileName)
       })
     } else {
@@ -75,7 +67,8 @@ export default function Log(): JSX.Element {
     const newPane = {
       label: (
         <Tooltip title={fileName}>
-          {platform === 'linux' || platform === 'darwin'
+          {localStorage.getItem('platform') === 'linux' ||
+          localStorage.getItem('platform') === 'darwin'
             ? fileName.split('/').pop()
             : fileName.split('\\').pop()}
         </Tooltip>