From d4df42dc08b264256fe4a5c012c6e0bfbc801c22 Mon Sep 17 00:00:00 2001 From: Behrang Shafei <50267830+bertiqwerty@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:26:01 +0100 Subject: [PATCH] other tools zoom on plus and equals. hence, we go back to doing so, too --- src/main.rs | 2 +- src/rvlib/events.rs | 2 +- src/rvlib/tools/always_active_zoom.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 33930c63..e2a99242 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,7 +46,7 @@ fn map_key(egui_key: egui::Key) -> Option { egui::Key::Num7 => Some(rvlib::KeyCode::Key7), egui::Key::Num8 => Some(rvlib::KeyCode::Key8), egui::Key::Num9 => Some(rvlib::KeyCode::Key9), - egui::Key::Plus => Some(rvlib::KeyCode::Plus), + egui::Key::Plus | egui::Key::Equals => Some(rvlib::KeyCode::PlusEquals), egui::Key::Minus => Some(rvlib::KeyCode::Minus), egui::Key::Delete => Some(rvlib::KeyCode::Delete), egui::Key::Backspace => Some(rvlib::KeyCode::Back), diff --git a/src/rvlib/events.rs b/src/rvlib/events.rs index 548a94f2..d26c07b2 100644 --- a/src/rvlib/events.rs +++ b/src/rvlib/events.rs @@ -84,7 +84,7 @@ pub enum KeyCode { Key7, Key8, Key9, - Plus, + PlusEquals, Minus, Delete, Back, diff --git a/src/rvlib/tools/always_active_zoom.rs b/src/rvlib/tools/always_active_zoom.rs index 47d6f35d..f47e4dd0 100644 --- a/src/rvlib/tools/always_active_zoom.rs +++ b/src/rvlib/tools/always_active_zoom.rs @@ -51,7 +51,7 @@ impl AlwaysActiveZoom { if events.held_ctrl() { let zb = if events.released(KeyCode::Key0) { None - } else if events.released(KeyCode::Plus) { + } else if events.released(KeyCode::PlusEquals) { zoom_box_mouse_wheel(*world.zoom_box(), world.shape_orig(), 1.0) } else if events.released(KeyCode::Minus) { zoom_box_mouse_wheel(*world.zoom_box(), world.shape_orig(), -1.0) @@ -79,7 +79,7 @@ impl Manipulate for AlwaysActiveZoom { (pressed, KeyCode::MouseLeft, mouse_pressed), (held, KeyCode::MouseLeft, mouse_held), (released, KeyCode::Key0, key_released), - (released, KeyCode::Plus, key_released), // Plus is equals + (released, KeyCode::PlusEquals, key_released), // Plus is equals (released, KeyCode::Minus, key_released) ] )