diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 3dba1c2..99b31f5 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -6,7 +6,7 @@ mod commands; #[cfg(target_os = "macos")] mod macos; mod tray; -mod window_utils; + use commands::shortcuts::GlobalShortcutState; use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs index 92f9f69..b03c7c9 100644 --- a/src-tauri/src/tray.rs +++ b/src-tauri/src/tray.rs @@ -1,7 +1,7 @@ use tauri::{ menu::{Menu, MenuItem}, tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}, - App, Manager, + App, }; pub fn create_tray(app: &App) -> Result<(), Box> { @@ -39,7 +39,7 @@ pub fn create_tray(app: &App) -> Result<(), Box> { } = event { let app = tray.app_handle(); - crate::commands::system::toggle_window(&app); + crate::commands::system::toggle_window(app); } }) .build(app)?; diff --git a/src-tauri/src/window_utils.rs b/src-tauri/src/window_utils.rs deleted file mode 100644 index e824a71..0000000 --- a/src-tauri/src/window_utils.rs +++ /dev/null @@ -1,11 +0,0 @@ -use tauri::AppHandle; -use tauri::Manager; - -pub fn show_and_focus_window(app: &AppHandle) { - if let Some(window) = app.get_webview_window("main") { - let _ = window.show(); - let _ = window.set_focus(); - #[cfg(target_os = "macos")] - crate::macos::force_focus(); - } -} diff --git a/src/api.ts b/src/api.ts index 3bc1aa3..3068521 100644 --- a/src/api.ts +++ b/src/api.ts @@ -8,6 +8,7 @@ export const tauriApi: ElectronAPI = { try { return await invoke('get_notes') } catch (e) { + // eslint-disable-next-line no-console console.error('Failed to get notes', e) return [] }