Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,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"
Expand Down
19 changes: 3 additions & 16 deletions src/app/menubar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use tray_icon::{
Icon, TrayIcon, TrayIconBuilder,
menu::{
AboutMetadataBuilder, Icon as Ico, IsMenuItem, Menu, MenuEvent, MenuItem,
PredefinedMenuItem, Submenu, accelerator::Accelerator,
PredefinedMenuItem, Submenu,
},
};

Expand Down Expand Up @@ -196,24 +196,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 {
Expand Down
1 change: 1 addition & 0 deletions src/app/tile/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
cmd.command.clone(),
)));
}

let is_clipboard_hotkey = shortcut == tile.hotkeys.clipboard_hotkey;
let is_open_hotkey = shortcut == tile.hotkeys.toggle;

Expand Down
Loading