Skip to content

minor input handling attempted fixes #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
unsecretised wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

minor input handling attempted fixes #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 0 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"
Expand Down
20 changes: 3 additions & 17 deletions src/app/menubar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};

Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions src/app/tile/update.rs
View file
Open in desktop
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