From be3ae1b70ad6267de81ed444a5b7ef04913997da Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Sat, 8 Jun 2024 12:32:31 +0800 Subject: [PATCH] Add files via upload --- Cargo.toml | 2 +- src/main.rs | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a07e90..ecff7ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sc_starter" -version = "1.2.0" +version = "1.3.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/main.rs b/src/main.rs index 350d411..dcba890 100644 --- a/src/main.rs +++ b/src/main.rs @@ -169,11 +169,17 @@ fn match_keys(groups: KeyStringGroups) -> (bool, KeyVkGroups) { results_mod.push(tmp); } - let result_vk = match VKey::from_keyname(&group2) { - Ok(vk_key) => vk_key, - Err(_) => VKey::OemClear, + let result_vk = if group2.len() != 1 { + match VKey::from_keyname(&group2.to_ascii_uppercase()) { + Ok(vk_key) => vk_key, + Err(_) => VKey::OemClear, + } + } else { + match VKey::from_keyname(&group2) { + Ok(vk_key) => vk_key, + Err(_) => VKey::OemClear, + } }; - let mut success = true; for i in &results_mod { if *i == ModKey::NoRepeat { @@ -273,10 +279,6 @@ fn main() { let settings = read_config(&path_infos.conf_path, &default_setting); println!("{:?}", &settings); //Set Hotkeys - let handler = set_hotkeys( - &path_infos.exe_path, - &path_infos.conf_path, - settings, - ); + let handler = set_hotkeys(&path_infos.exe_path, &path_infos.conf_path, settings); handler.join().unwrap(); }