From 7772fc99e406535726a192f5a1446373df37b0a9 Mon Sep 17 00:00:00 2001 From: unsecretised Date: Sun, 29 Mar 2026 21:01:26 +0800 Subject: [PATCH] minor fixes --- Cargo.lock | 18 ------------------ Cargo.toml | 6 +----- src/app/menubar.rs | 20 +++----------------- src/app/tile/update.rs | 1 + 4 files changed, 5 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c059a04..98cf30d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1571,23 +1571,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "global-hotkey" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9247516746aa8e53411a0db9b62b0e24efbcf6a76e0ba73e5a91b512ddabed7" -dependencies = [ - "crossbeam-channel", - "keyboard-types", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "once_cell", - "thiserror 2.0.18", - "windows-sys 0.59.0", - "x11rb", - "xkeysym", -] - [[package]] name = "glow" version = "0.16.0" @@ -3856,7 +3839,6 @@ dependencies = [ "arboard", "block2 0.6.2", "emojis", - "global-hotkey", "iced", "icns", "image", diff --git a/Cargo.toml b/Cargo.toml index 82cb240..43950c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,6 @@ repository = "https://github.com/RustCastLabs/rustcast" arboard = "3.6.1" block2 = "0.6.2" emojis = "0.8.0" -global-hotkey = "0.7.0" iced = { version = "0.14.0", features = ["image", "tokio"] } icns = "0.3.1" image = { version = "0.25.9", features = ["tiff"] } @@ -20,10 +19,7 @@ log = "0.4.29" minreq = { version = "2.14.1", features = ["https"] } objc2 = "0.6.3" objc2-app-kit = { version = "0.3.2", features = ["NSImage"] } -objc2-application-services = { version = "0.3.2", default-features = false, features = [ - "HIServices", - "Processes", -] } +objc2-application-services = { version = "0.3.2", default-features = false, features = ["HIServices", "Processes"] } objc2-core-foundation = "0.3.2" objc2-foundation = { version = "0.3.2", features = ["NSString"] } objc2-service-management = "0.3.2" diff --git a/src/app/menubar.rs b/src/app/menubar.rs index 817a6e1..7b82e88 100644 --- a/src/app/menubar.rs +++ b/src/app/menubar.rs @@ -2,14 +2,13 @@ use std::{collections::HashMap, io::Cursor}; -use global_hotkey::hotkey::{Code, Modifiers}; use image::{DynamicImage, ImageReader}; use log::info; use tray_icon::{ Icon, TrayIcon, TrayIconBuilder, menu::{ AboutMetadataBuilder, Icon as Ico, IsMenuItem, Menu, MenuEvent, MenuItem, - PredefinedMenuItem, Submenu, accelerator::Accelerator, + PredefinedMenuItem, Submenu, }, }; @@ -196,24 +195,11 @@ fn open_issue_item() -> MenuItem { } fn refresh_item() -> MenuItem { - MenuItem::with_id( - "refresh_rustcast", - "Refresh", - true, - Some(Accelerator::new( - Some(Modifiers::SUPER), - global_hotkey::hotkey::Code::KeyR, - )), - ) + MenuItem::with_id("refresh_rustcast", "Refresh", true, None) } fn open_settings_item() -> MenuItem { - MenuItem::with_id( - "open_preferences", - "Open Preferences", - true, - Some(Accelerator::new(Some(Modifiers::SUPER), Code::Comma)), - ) + MenuItem::with_id("open_preferences", "Open Preferences", true, None) } fn get_help_item() -> MenuItem { diff --git a/src/app/tile/update.rs b/src/app/tile/update.rs index 9ae7951..f3aa95b 100644 --- a/src/app/tile/update.rs +++ b/src/app/tile/update.rs @@ -331,6 +331,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task { cmd.command.clone(), ))); } + let is_clipboard_hotkey = shortcut == tile.hotkeys.clipboard_hotkey; let is_open_hotkey = shortcut == tile.hotkeys.toggle;