fix issues

callmeclover · May 16, 2024 · 43e93c4 · 43e93c4
1 parent ff10355
commit 43e93c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/func.rs b/src/func.rs
@@ -311,15 +311,15 @@ pub async fn main_logic(options: &[(&str, usize)], tts: &mut Tts, enigo: &mut En
                 }
                 "XY_Move" => {
                     let display = Screen::from_point(0, 0).unwrap().display_info;
-                    pen.update_position((rng.gen_range(0..=display.width), rng.gen_range(0..=display.height)));
+                    pen.update_position((rng.gen_range(0..=display.width).try_into().unwrap(), rng.gen_range(0..=display.height).try_into().unwrap()));
                 }
                 "X_Move" => {
                     let display = Screen::from_point(0, 0).unwrap().display_info;
-                    pen.update_position((rng.gen_range(0..=display.width), -1));
+                    pen.update_position((rng.gen_range(0..=display.width).try_into().unwrap(), -1));
                 }
                 "Y_Move" => {
                     let display = Screen::from_point(0, 0).unwrap().display_info;
-                    pen.update_position((-1, rng.gen_range(0..=display.height)));
+                    pen.update_position((-1, rng.gen_range(0..=display.height).try_into().unwrap()));
                 }
                 _=>{
                     pen.toggle_button(action);

diff --git a/src/model.rs b/src/model.rs
@@ -50,12 +50,12 @@ impl GamepadInjector {
             if !self.abs_buttons.get(button).unwrap() {
                 self.abs_buttons.insert(button.to_string(), true);
                 let mut buttons = self.buttons();
-                buttons |= model::GamepadInjector::get_value_of_button(button);
+                buttons |= GamepadInjector::get_value_of_button(button);
                 self.update_buttons(buttons);
             } else {
                 self.abs_buttons.insert(button.to_string(), false);
                 let mut buttons = self.buttons();
-                buttons |= model::GamepadInjector::get_value_of_button(button);
+                buttons |= GamepadInjector::get_value_of_button(button);
                 self.update_buttons(buttons);
             }
         }
@@ -149,12 +149,12 @@ impl PenInjector {
             if !self.abs_buttons.get(button).unwrap() {
                 self.abs_buttons.insert(button.to_string(), true);
                 let mut buttons = self.buttons();
-                buttons |= model::PenInjector::get_value_of_button(button);
+                buttons |= PenInjector::get_value_of_button(button);
                 self.update_buttons(buttons);
             } else {
                 self.abs_buttons.insert(button.to_string(), false);
                 let mut buttons = self.buttons();
-                buttons |= model::PenInjector::get_value_of_button(button);
+                buttons |= PenInjector::get_value_of_button(button);
                 self.update_buttons(buttons);
             }
         }