diff --git a/assets/css/style.scss b/assets/css/style.scss index 94f77e8..567ff11 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -9,25 +9,25 @@ $mutedtext: #78756F; @font-face { font-family: SFRoundedRegular; font-display: swap; - src: url("~/assets/fonts/SFRoundedRegular.otf") format("woff2"); + src: url("~/assets/fonts/SFRoundedRegular.otf") format("opentype"); } @font-face { font-family: SFRoundedMedium; font-display: swap; - src: url("~/assets/fonts/SFRoundedMedium.otf") format("woff2"); + src: url("~/assets/fonts/SFRoundedMedium.otf") format("opentype"); } @font-face { font-family: SFRoundedSemiBold; font-display: swap; - src: url("~/assets/fonts/SFRoundedSemiBold.otf") format("woff2"); + src: url("~/assets/fonts/SFRoundedSemiBold.otf") format("opentype"); } @font-face { - font-family: SFMonoRegular; + font-family: CommitMono; font-display: swap; - src: url("~/assets/fonts/SFMonoRegular.otf") format("woff2"); + src: url("~/assets/fonts/CommitMono.woff2") format("woff2"); } * { @@ -149,7 +149,7 @@ body, left: 284px; padding: 8px; height: calc(100vh - 96px); - font-family: SFMonoRegular !important; + font-family: CommitMono !important; font-size: 14px; letter-spacing: 1; border-radius: 10px; @@ -159,7 +159,7 @@ body, div { border-radius: 10px; - font-family: SFMonoRegular !important; + font-family: CommitMono !important; } .full-image { diff --git a/assets/fonts/CommitMono.woff2 b/assets/fonts/CommitMono.woff2 new file mode 100644 index 0000000..f9ac1ee Binary files /dev/null and b/assets/fonts/CommitMono.woff2 differ diff --git a/assets/fonts/SFMonoRegular.otf b/assets/fonts/SFMonoRegular.otf deleted file mode 100644 index 4c6f9f6..0000000 Binary files a/assets/fonts/SFMonoRegular.otf and /dev/null differ diff --git a/src-tauri/src/api/tray.rs b/src-tauri/src/api/tray.rs index d279774..d332489 100644 --- a/src-tauri/src/api/tray.rs +++ b/src-tauri/src/api/tray.rs @@ -1,7 +1,7 @@ use tauri::{ - Manager, menu::{MenuBuilder, MenuItemBuilder}, tray::{MouseButton, TrayIconBuilder, TrayIconEvent}, + Manager, }; pub fn setup(app: &mut tauri::App) -> Result<(), Box> { @@ -15,6 +15,9 @@ pub fn setup(app: &mut tauri::App) -> Result<(), Box> { let _tray = TrayIconBuilder::new() .menu( &MenuBuilder::new(app) + .items(&[&MenuItemBuilder::with_id("app_name", "Qopy") + .enabled(false) + .build(app)?]) .items(&[&MenuItemBuilder::with_id("show", "Show/Hide").build(app)?]) .items(&[&MenuItemBuilder::with_id("quit", "Quit").build(app)?]) .build()?, @@ -34,20 +37,16 @@ pub fn setup(app: &mut tauri::App) -> Result<(), Box> { } _ => (), }) - .on_tray_icon_event(move |_tray, event| { - if let TrayIconEvent::Click { button, .. } = event { - if button == MouseButton::Left { - let is_visible = window_clone_for_click.is_visible().unwrap(); - if is_visible { - window_clone_for_click.hide().unwrap(); - } else { - window_clone_for_click.show().unwrap(); - } - } - } - }) + // .on_tray_icon_event(move |_tray, event| { + // if let TrayIconEvent::Click { button, .. } = event { + // if button == MouseButton::Left { + // window_clone_for_click.show().unwrap(); + // window_clone_for_click.set_focus().unwrap(); + // } + // } + // }) .icon(icon) .build(app)?; Ok(()) -} \ No newline at end of file +}