From 2aec8f0304f23053219c21bbcc473854284e5cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Ortiz?= Date: Mon, 16 Nov 2026 20:05:30 +0100 Subject: [PATCH] Orbit by holding V from any tool Hold V and move the pointer to orbit without clicking, or hold Shift + V to pan, from every tool. Releasing V resumes the current tool and any pending operation. Cmd/Ctrl + V still pastes, a dimension being typed keeps its letters, and a tap still selects a custom V tool shortcut. Add a persisted Navigation setting, enabled by default, list the gesture in the keyboard shortcuts reference, and show a status hint while orbiting. Closes #59. --- assets/i18n/en_US.json | 7 ++ assets/i18n/es_419.json | 7 ++ assets/i18n/pt_BR.json | 7 ++ assets/i18n/vi_VN.json | 7 ++ assets/i18n/zh_CN.json | 7 ++ crates/benchup-app/src/app.rs | 78 ++++++++++++++- crates/benchup-app/src/app_tests.rs | 121 ++++++++++++++++++++++++ crates/benchup-app/src/section_gizmo.rs | 2 +- crates/benchup-app/src/settings.rs | 5 + crates/benchup-app/src/shortcuts.rs | 13 ++- crates/benchup-app/src/sidebar.rs | 21 ++++ 11 files changed, 268 insertions(+), 7 deletions(-) diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 996f579..960136d 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -144,6 +144,7 @@ "app.move_option_toggles_copy_click_base_point_and": "Move · Option toggles Copy · Click base point and destination", "app.move_over_the_drawing_plane_to_set_a": "Move over the drawing plane to set a direction", "app.move_the_cursor_to_orbit_hold_shift_to": "Move the cursor to orbit · Hold Shift to pan · Release Ctrl / ⌘ to resume drawing", + "app.hold_v_orbit_status": "Move the cursor to orbit · Hold Shift to pan · Release V to resume", "app.move_the_pointer_to_choose_a_direction_first": "Move the pointer to choose a direction first", "app.move_the_pointer_to_give_the_shape_some": "Move the pointer to give the shape some size", "app.new_faces": "New faces · ", @@ -1509,6 +1510,10 @@ "shortcuts.open_project": "Open project", "shortcuts.orbit": "Orbit", "shortcuts.orbit_while_drawing": "Orbit while drawing", + "shortcuts.orbit_from_any_tool": "Orbit from any tool", + "shortcuts.pan_from_any_tool": "Pan from any tool", + "shortcuts.hold_v_move_pointer": "Hold V + move pointer", + "shortcuts.hold_shift_v_move_pointer": "Hold Shift + V + move pointer", "shortcuts.paint_faces": "Paint faces", "shortcuts.pan_while_orbiting": "Pan while orbiting", "shortcuts.paste": "Paste", @@ -2076,6 +2081,8 @@ "settings.navigation_type": "Navigation type", "settings.middle_mouse_drag": "Middle mouse drag", "settings.orbit_shift_to_pan": "Orbit (Shift to pan)", + "settings.hold_v_to_orbit": "Hold V and move the pointer to orbit", + "settings.hold_v_to_orbit_hint": "Works with every tool without clicking. Hold Shift as well to pan. Release V to continue where you left off.", "settings.pan_shift_to_orbit": "Pan (Shift to orbit)", "settings.no_device_detected": "No device detected", "settings.scales_mouse_look_while_walking_100_matches_orbit_sensitivity": "Scales mouse look while walking. 100% matches Orbit sensitivity.", diff --git a/assets/i18n/es_419.json b/assets/i18n/es_419.json index ee5d550..20102d6 100644 --- a/assets/i18n/es_419.json +++ b/assets/i18n/es_419.json @@ -144,6 +144,7 @@ "app.move_option_toggles_copy_click_base_point_and": "Mover · Option alterna Copiar · Haz clic en el punto base y en el destino", "app.move_over_the_drawing_plane_to_set_a": "Mueve el cursor sobre el plano de dibujo para definir una dirección", "app.move_the_cursor_to_orbit_hold_shift_to": "Mueve el cursor para orbitar · Mantén Shift para desplazar · Suelta Ctrl / ⌘ para seguir dibujando", + "app.hold_v_orbit_status": "Mueve el cursor para orbitar · Mantén Shift para desplazar · Suelta V para continuar", "app.move_the_pointer_to_choose_a_direction_first": "Mueve el puntero para elegir primero una dirección", "app.move_the_pointer_to_give_the_shape_some": "Mueve el puntero para darle tamaño a la forma", "app.new_faces": "Caras nuevas · ", @@ -1509,6 +1510,10 @@ "shortcuts.open_project": "Abrir proyecto", "shortcuts.orbit": "Órbita", "shortcuts.orbit_while_drawing": "Orbitar mientras se dibuja", + "shortcuts.orbit_from_any_tool": "Orbitar desde cualquier herramienta", + "shortcuts.pan_from_any_tool": "Desplazar desde cualquier herramienta", + "shortcuts.hold_v_move_pointer": "Mantener V + mover el puntero", + "shortcuts.hold_shift_v_move_pointer": "Mantener Shift + V + mover el puntero", "shortcuts.paint_faces": "Pintar caras", "shortcuts.pan_while_orbiting": "Desplazar mientras se orbita", "shortcuts.paste": "Pegar", @@ -2076,6 +2081,8 @@ "settings.navigation_type": "Tipo de navegación", "settings.middle_mouse_drag": "Arrastre con el botón central del mouse", "settings.orbit_shift_to_pan": "Órbita (Shift para desplazar)", + "settings.hold_v_to_orbit": "Mantén V y mueve el puntero para orbitar", + "settings.hold_v_to_orbit_hint": "Funciona con todas las herramientas sin hacer clic. Mantén también Shift para desplazar. Suelta V para continuar donde lo dejaste.", "settings.pan_shift_to_orbit": "Desplazamiento (Shift para orbitar)", "settings.no_device_detected": "No se detectó ningún dispositivo", "settings.scales_mouse_look_while_walking_100_matches_orbit_sensitivity": "Escala la mirada con el mouse al caminar. 100 % equivale a la sensibilidad de Órbita.", diff --git a/assets/i18n/pt_BR.json b/assets/i18n/pt_BR.json index 9f33f37..68e59e1 100644 --- a/assets/i18n/pt_BR.json +++ b/assets/i18n/pt_BR.json @@ -144,6 +144,7 @@ "app.move_option_toggles_copy_click_base_point_and": "Mover · Option alterna para Copiar · Clique no ponto base e no destino", "app.move_over_the_drawing_plane_to_set_a": "Passe o cursor sobre o plano de desenho para definir uma direção", "app.move_the_cursor_to_orbit_hold_shift_to": "Mova o cursor para orbitar · Segure Shift para mover a vista · Solte Ctrl / ⌘ para voltar a desenhar", + "app.hold_v_orbit_status": "Mova o cursor para orbitar · Segure Shift para mover a vista · Solte V para continuar", "app.move_the_pointer_to_choose_a_direction_first": "Mova o ponteiro para escolher uma direção primeiro", "app.move_the_pointer_to_give_the_shape_some": "Mova o ponteiro para dar tamanho à forma", "app.new_faces": "Novas faces · ", @@ -1507,6 +1508,10 @@ "shortcuts.open_project": "Abrir projeto", "shortcuts.orbit": "Orbitar", "shortcuts.orbit_while_drawing": "Orbitar enquanto desenha", + "shortcuts.orbit_from_any_tool": "Orbitar a partir de qualquer ferramenta", + "shortcuts.pan_from_any_tool": "Mover a vista a partir de qualquer ferramenta", + "shortcuts.hold_v_move_pointer": "Segurar V + mover o ponteiro", + "shortcuts.hold_shift_v_move_pointer": "Segurar Shift + V + mover o ponteiro", "shortcuts.paint_faces": "Pintar faces", "shortcuts.pan_while_orbiting": "Mover vista enquanto orbita", "shortcuts.paste": "Colar", @@ -2074,6 +2079,8 @@ "settings.navigation_type": "Tipo de navegação", "settings.middle_mouse_drag": "Arrastar com o botão do meio", "settings.orbit_shift_to_pan": "Orbitar (Shift para mover a vista)", + "settings.hold_v_to_orbit": "Segure V e mova o ponteiro para orbitar", + "settings.hold_v_to_orbit_hint": "Funciona com todas as ferramentas, sem clicar. Segure também Shift para mover a vista. Solte V para continuar de onde parou.", "settings.pan_shift_to_orbit": "Mover a vista (Shift para orbitar)", "settings.no_device_detected": "Nenhum dispositivo detectado", "settings.scales_mouse_look_while_walking_100_matches_orbit_sensitivity": "Ajusta a escala do olhar com o mouse ao caminhar. 100% equivale à sensibilidade de Orbitar.", diff --git a/assets/i18n/vi_VN.json b/assets/i18n/vi_VN.json index 7e8bc79..9ed66ec 100644 --- a/assets/i18n/vi_VN.json +++ b/assets/i18n/vi_VN.json @@ -144,6 +144,7 @@ "app.move_option_toggles_copy_click_base_point_and": "Di chuyển · Option chuyển sang Sao chép · Nhấp điểm gốc và điểm đích", "app.move_over_the_drawing_plane_to_set_a": "Di chuyển trên mặt phẳng vẽ để đặt hướng", "app.move_the_cursor_to_orbit_hold_shift_to": "Di chuyển con trỏ để xoay quanh · Giữ Shift để dịch chuyển khung nhìn · Thả Ctrl / ⌘ để tiếp tục vẽ", + "app.hold_v_orbit_status": "Di chuyển con trỏ để xoay quanh · Giữ Shift để dịch chuyển khung nhìn · Thả V để tiếp tục", "app.move_the_pointer_to_choose_a_direction_first": "Di chuyển con trỏ để chọn hướng trước", "app.move_the_pointer_to_give_the_shape_some": "Di chuyển con trỏ để tạo hình dạng có kích thước nào đó", "app.new_faces": "Mặt mới · ", @@ -1509,6 +1510,10 @@ "shortcuts.open_project": "Mở dự án", "shortcuts.orbit": "Xoay quanh", "shortcuts.orbit_while_drawing": "Quỹ đạo trong khi vẽ", + "shortcuts.orbit_from_any_tool": "Xoay quanh từ bất kỳ công cụ nào", + "shortcuts.pan_from_any_tool": "Dịch chuyển khung nhìn từ bất kỳ công cụ nào", + "shortcuts.hold_v_move_pointer": "Giữ V + di chuyển con trỏ", + "shortcuts.hold_shift_v_move_pointer": "Giữ Shift + V + di chuyển con trỏ", "shortcuts.paint_faces": "Mặt sơn", "shortcuts.pan_while_orbiting": "Pan khi quay quanh", "shortcuts.paste": "Dán", @@ -2076,6 +2081,8 @@ "settings.navigation_type": "Kiểu điều hướng", "settings.middle_mouse_drag": "Kéo bằng nút chuột giữa", "settings.orbit_shift_to_pan": "Xoay quanh (giữ Shift để dịch chuyển)", + "settings.hold_v_to_orbit": "Giữ V và di chuyển con trỏ để xoay quanh", + "settings.hold_v_to_orbit_hint": "Hoạt động với mọi công cụ mà không cần nhấp chuột. Giữ thêm Shift để dịch chuyển khung nhìn. Thả V để tiếp tục từ chỗ bạn đã dừng.", "settings.pan_shift_to_orbit": "Dịch chuyển (giữ Shift để xoay quanh)", "settings.no_device_detected": "Không phát hiện thiết bị", "settings.scales_mouse_look_while_walking_100_matches_orbit_sensitivity": "Điều chỉnh độ nhạy nhìn bằng chuột khi đi bộ. 100% bằng độ nhạy xoay quanh.", diff --git a/assets/i18n/zh_CN.json b/assets/i18n/zh_CN.json index 5d4a522..1f49100 100644 --- a/assets/i18n/zh_CN.json +++ b/assets/i18n/zh_CN.json @@ -144,6 +144,7 @@ "app.move_option_toggles_copy_click_base_point_and": "移动 · Option 切换为复制 · 单击基点和目标点", "app.move_over_the_drawing_plane_to_set_a": "在绘图平面上移动以确定方向", "app.move_the_cursor_to_orbit_hold_shift_to": "移动光标以环绕视图 · 按住 Shift 平移 · 松开 Ctrl / ⌘ 继续绘制", + "app.hold_v_orbit_status": "移动光标以环绕视图 · 按住 Shift 平移 · 松开 V 继续", "app.move_the_pointer_to_choose_a_direction_first": "请先移动指针选择方向", "app.move_the_pointer_to_give_the_shape_some": "移动指针为形状指定尺寸", "app.new_faces": "新面 · ", @@ -1509,6 +1510,10 @@ "shortcuts.open_project": "打开项目", "shortcuts.orbit": "环绕", "shortcuts.orbit_while_drawing": "绘图时环绕", + "shortcuts.orbit_from_any_tool": "在任意工具中环绕", + "shortcuts.pan_from_any_tool": "在任意工具中平移", + "shortcuts.hold_v_move_pointer": "按住 V + 移动指针", + "shortcuts.hold_shift_v_move_pointer": "按住 Shift + V + 移动指针", "shortcuts.paint_faces": "为面涂色", "shortcuts.pan_while_orbiting": "环绕时平移", "shortcuts.paste": "粘贴", @@ -2076,6 +2081,8 @@ "settings.navigation_type": "导航类型", "settings.middle_mouse_drag": "鼠标中键拖动", "settings.orbit_shift_to_pan": "环绕(按住 Shift 平移)", + "settings.hold_v_to_orbit": "按住 V 并移动指针以环绕视图", + "settings.hold_v_to_orbit_hint": "适用于所有工具,无需点击。同时按住 Shift 可平移。松开 V 即可从中断处继续。", "settings.pan_shift_to_orbit": "平移(按住 Shift 环绕)", "settings.no_device_detected": "未检测到设备", "settings.scales_mouse_look_while_walking_100_matches_orbit_sensitivity": "调整行走时鼠标视角的灵敏度。100% 与环绕灵敏度一致。", diff --git a/crates/benchup-app/src/app.rs b/crates/benchup-app/src/app.rs index ed9ae5f..85544e8 100644 --- a/crates/benchup-app/src/app.rs +++ b/crates/benchup-app/src/app.rs @@ -422,6 +422,10 @@ pub struct BenchUpApp { setting_orbit_focus: bool, drawing_orbit_down: bool, drawing_orbit_pivot: Option, + /// V is held for hover navigation from any tool. + orbit_key_down: bool, + /// The held V key has moved the camera, so its release is not a tap. + orbit_key_moved: bool, viewport_pointer: Option, viewport: Rect, viewports: viewports::Workspace, @@ -615,6 +619,8 @@ impl BenchUpApp { setting_orbit_focus: false, drawing_orbit_down: false, drawing_orbit_pivot: None, + orbit_key_down: false, + orbit_key_moved: false, viewport_pointer: None, viewport: Rect::NOTHING, viewports: viewports::Workspace::default(), @@ -2367,6 +2373,9 @@ impl BenchUpApp { } fn keyboard(&mut self, ctx: &egui::Context) { + // Hold-to-orbit ends whenever text entry, a dialog, or Walk owns the + // keyboard; it is restored below only when viewport shortcuts apply. + let orbit_key_was_down = std::mem::take(&mut self.orbit_key_down); // Track Ctrl through dialogs and shortcut early returns. When modeling // input is allowed, replay modifier events from the previous state. let pull_modifier_was_down = self.push_pull_modifier_down; @@ -2531,6 +2540,7 @@ impl BenchUpApp { }; return; } + self.orbit_key_down = orbit_key_was_down && self.general_settings.hold_v_to_orbit; self.sidebar_shortcut(ctx); let events = ctx.input(|i| i.events.clone()); let copy_event = events.iter().any(|e| matches!(e, egui::Event::Copy)); @@ -2585,6 +2595,31 @@ impl BenchUpApp { }, ); } + egui::Event::Key { + key: Key::V, + pressed: true, + repeat: false, + modifiers, + .. + } if self.orbit_key_available(modifiers) => { + self.orbit_key_down = true; + self.orbit_key_moved = false; + } + egui::Event::Key { + key: Key::V, + pressed: false, + .. + } if self.orbit_key_down => { + self.orbit_key_down = false; + // A tap without camera motion keeps a custom V tool shortcut. + if !self.orbit_key_moved + && let Some(tool) = self.general_settings.tool_for_key(Key::V) + { + self.set_tool(tool); + } + } + // The held orbit key must not type into a pending dimension. + egui::Event::Text(text) if self.orbit_key_down && text.eq_ignore_ascii_case("v") => {} egui::Event::Key { key, pressed: true, @@ -2699,6 +2734,19 @@ impl BenchUpApp { } } self.push_pull_modifier_down = ctx.input(|i| i.modifiers.ctrl); + // Some platforms drop key releases, for example while a window loses + // focus. Never leave hover navigation latched after V is up. + if self.orbit_key_down && !ctx.input(|i| i.key_down(Key::V)) { + self.orbit_key_down = false; + } + } + + /// Plain V, or Shift + V for panning, starts hold-to-orbit. Command + /// modifiers keep Paste, and letters belong to a dimension being typed. + fn orbit_key_available(&self, modifiers: egui::Modifiers) -> bool { + self.general_settings.hold_v_to_orbit + && !(modifiers.ctrl || modifiers.command || modifiers.mac_cmd || modifiers.alt) + && !(self.precision_available() && !self.length_input.is_empty()) } fn icon_button( @@ -3218,7 +3266,9 @@ impl BenchUpApp { ) .show(ui, |ui| { ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - let drawing_orbit = self.drawing_orbit_modifier(ctx.input(|i| i.modifiers)); + let modifiers = ctx.input(|i| i.modifiers); + let orbit_key = self.orbit_key_down && !self.drawing_orbit_modifier(modifiers); + let drawing_orbit = self.drawing_orbit_modifier(modifiers); let navigating = self .gesture .as_ref() @@ -3226,6 +3276,8 @@ impl BenchUpApp { let shared_status = self.shared_status(ctx.input(|i|i.time)); let message = if let Some(status) = shared_status.as_deref() { status + } else if orbit_key { + tr!("app.hold_v_orbit_status") } else if drawing_orbit { tr!("app.move_the_cursor_to_orbit_hold_shift_to") } else if navigating { @@ -4706,14 +4758,28 @@ impl BenchUpApp { && (modifiers.ctrl || modifiers.command || modifiers.mac_cmd) } + /// Hover navigation: Ctrl/Cmd while drawing, or a held V from any tool. + fn hover_orbit_active(&self, modifiers: egui::Modifiers) -> bool { + self.orbit_key_down || self.drawing_orbit_modifier(modifiers) + } + fn update_drawing_orbit(&mut self, modifiers: egui::Modifiers) { - let down = self.drawing_orbit_modifier(modifiers); + let down = self.hover_orbit_active(modifiers); if down != self.drawing_orbit_down { self.drawing_orbit_down = down; self.drawing_orbit_pivot = None; if let Some(gesture) = &mut self.gesture { - // An interrupted point click must not place geometry on release. - if down && matches!(gesture.kind, GestureKind::Line | GestureKind::Shape | GestureKind::GrainDirection) { + // An interrupted click or drag must not place geometry, + // change the selection, or apply an edit on release. + if down + && !matches!( + gesture.kind, + GestureKind::Navigate { .. } + | GestureKind::Compass { .. } + | GestureKind::Freehand { .. } + | GestureKind::DrawingNavigate + ) + { gesture.kind = GestureKind::DrawingNavigate; } if down && let GestureKind::Freehand { paused } = &mut gesture.kind { @@ -4864,6 +4930,7 @@ impl BenchUpApp { let events = ctx.input(|i| i.events.clone()); let focused = ctx.input(|i| i.focused); if !focused { + self.orbit_key_down = false; self.drawing_orbit_down = false; self.drawing_orbit_pivot = None; self.viewport_pointer = None; @@ -4914,7 +4981,7 @@ impl BenchUpApp { match event { egui::Event::ModifiersChanged(modifiers) => { refresh_pointer |= - self.drawing_orbit_down && !self.drawing_orbit_modifier(modifiers); + self.drawing_orbit_down && !self.hover_orbit_active(modifiers); self.update_drawing_orbit(modifiers); } egui::Event::PointerButton { @@ -5078,6 +5145,7 @@ impl BenchUpApp { let mut pivot = self.drawing_orbit_pivot; self.navigate(ctx, dv(pos - previous), &mut pivot, None); self.drawing_orbit_pivot = pivot; + self.orbit_key_moved |= self.orbit_key_down && pos != previous; } } self.viewport_pointer = in_viewport.then_some(pos); diff --git a/crates/benchup-app/src/app_tests.rs b/crates/benchup-app/src/app_tests.rs index 77eca1f..8565229 100644 --- a/crates/benchup-app/src/app_tests.rs +++ b/crates/benchup-app/src/app_tests.rs @@ -7459,3 +7459,124 @@ fn focus_picker_highlights_like_pointer_without_selecting() { h.app.update_pointer(pos); assert_eq!(h.app.hover, None); } + +fn orbit_key_event(pressed: bool, modifiers: egui::Modifiers) -> Vec { + let mut events = vec![egui::Event::Key { + key: Key::V, + physical_key: None, + pressed, + repeat: false, + modifiers, + }]; + if pressed { + events.push(egui::Event::Text(if modifiers.shift { "V" } else { "v" }.into())); + } + events +} + +#[test] +fn holding_v_orbits_and_pans_from_any_tool_without_clicking() { + for tool in [Tool::Select, Tool::Move, Tool::PushPull, Tool::Line, Tool::TapeMeasure, Tool::Erase] { + for shift in [false, true] { + let modifiers = if shift { egui::Modifiers::SHIFT } else { egui::Modifiers::NONE }; + let mut h = Harness::new(); + h.app.set_tool(tool); + let start = h.app.viewport.center(); + h.frame(vec![egui::Event::PointerMoved(start)], egui::Modifiers::NONE); + let before = h.app.doc.camera.clone(); + h.frame(orbit_key_event(true, modifiers), modifiers); + assert!(h.app.navigating(), "{tool:?}"); + assert_eq!(h.app.doc.camera, before); + // The key stays held across frames without further key events. + h.frame(vec![], modifiers); + let end = start + egui::vec2(12., 8.); + h.frame(vec![egui::Event::PointerMoved(end)], modifiers); + let mut expected = before.clone(); + if shift { + expected.pan(DVec2::new(12., 8.), h.app.viewport.height() as f64); + } else { + expected.orbit_around(DVec2::new(12., 8.), DVec3::ZERO); + } + assert_eq!(h.app.doc.camera, expected, "{tool:?} shift={shift}"); + assert_eq!(h.app.tool, tool); + assert!(h.app.length_input.is_empty()); + assert!(h.app.gesture.is_none()); + + h.frame(orbit_key_event(false, modifiers), modifiers); + assert!(!h.app.navigating()); + assert_eq!(h.app.tool, tool, "Releasing V must resume the previous tool"); + h.frame(vec![egui::Event::PointerMoved(end + egui::vec2(6., 4.))], egui::Modifiers::NONE); + assert_eq!(h.app.doc.camera, expected); + } + } +} + +#[test] +fn holding_v_preserves_a_pending_line_and_its_dimension_input() { + let mut h = Harness::new(); + h.key(Key::L); + let start = h.at(DVec3::ZERO); + h.click(start); + let line_start = h.app.line_start; + assert!(line_start.is_some()); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert!(h.app.navigating()); + assert!(h.app.length_input.is_empty(), "V must not type into the dimension"); + h.frame(vec![egui::Event::PointerMoved(start + egui::vec2(10., 0.))], egui::Modifiers::NONE); + h.frame(orbit_key_event(false, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert_eq!(h.app.line_start, line_start); + assert!(h.app.doc.model.edges.is_empty()); + + // Letters typed after a value belong to the dimension instead. + h.frame(vec![egui::Event::Text("3".into())], egui::Modifiers::NONE); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert!(!h.app.navigating()); + assert_eq!(h.app.length_input, "3v"); +} + +#[test] +fn hold_v_orbit_respects_the_setting_and_command_paste() { + let mut h = Harness::new(); + h.app.general_settings.hold_v_to_orbit = false; + let start = h.app.viewport.center(); + h.frame(vec![egui::Event::PointerMoved(start)], egui::Modifiers::NONE); + let before = h.app.doc.camera.clone(); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + h.frame(vec![egui::Event::PointerMoved(start + egui::vec2(12., 8.))], egui::Modifiers::NONE); + assert!(!h.app.navigating()); + assert_eq!(h.app.doc.camera, before); + h.frame(orbit_key_event(false, egui::Modifiers::NONE), egui::Modifiers::NONE); + + h.app.general_settings.hold_v_to_orbit = true; + h.frame(orbit_key_event(true, egui::Modifiers::COMMAND), egui::Modifiers::COMMAND); + assert!(!h.app.navigating(), "Cmd/Ctrl + V stays Paste"); +} + +#[test] +fn tapping_v_keeps_a_custom_v_tool_shortcut_but_holding_orbits() { + let mut h = Harness::new(); + let index = settings::TOOLS.iter().position(|(tool, _)| *tool == Tool::Rotate).unwrap(); + h.app.general_settings.tool_keys[index] = "V".into(); + let start = h.app.viewport.center(); + h.frame(vec![egui::Event::PointerMoved(start)], egui::Modifiers::NONE); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert_eq!(h.app.tool, Tool::Select); + h.frame(orbit_key_event(false, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert_eq!(h.app.tool, Tool::Rotate, "A tap selects the tool assigned to V"); + + h.app.set_tool(Tool::Select); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + h.frame(vec![egui::Event::PointerMoved(start + egui::vec2(12., 8.))], egui::Modifiers::NONE); + h.frame(orbit_key_event(false, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert_eq!(h.app.tool, Tool::Select, "Orbiting with V is not a tap"); +} + +#[test] +fn holding_v_cancels_an_interrupted_selection_click() { + let mut h = Harness::new(); + let start = h.app.viewport.center(); + h.pointer(start, egui::PointerButton::Primary, true, false); + assert!(matches!(h.app.gesture.as_ref().unwrap().kind, GestureKind::Select { .. })); + h.frame(orbit_key_event(true, egui::Modifiers::NONE), egui::Modifiers::NONE); + assert!(matches!(h.app.gesture.as_ref().unwrap().kind, GestureKind::DrawingNavigate)); +} diff --git a/crates/benchup-app/src/section_gizmo.rs b/crates/benchup-app/src/section_gizmo.rs index 4b3f7d3..ccb48e4 100644 --- a/crates/benchup-app/src/section_gizmo.rs +++ b/crates/benchup-app/src/section_gizmo.rs @@ -248,7 +248,7 @@ impl BenchUpApp { && response.enabled() && response.contains_pointer() && self.viewport.contains(*pos) - && !self.drawing_orbit_modifier(*modifiers) + && !self.hover_orbit_active(*modifiers) && !self.compass_contains(*pos) && let Some(handle) = self .section_handles() diff --git a/crates/benchup-app/src/settings.rs b/crates/benchup-app/src/settings.rs index d7b813a..d31422d 100644 --- a/crates/benchup-app/src/settings.rs +++ b/crates/benchup-app/src/settings.rs @@ -192,6 +192,8 @@ pub(super) struct GeneralSettings { pub language: String, pub navigation_type: NavigationType, pub middle_mouse_pan: bool, + /// Holding V orbits (Shift + V pans) from any tool without clicking. + pub hold_v_to_orbit: bool, pub orbit_speed: f64, pub pan_speed: f64, pub zoom_speed: f64, @@ -216,6 +218,7 @@ impl Default for GeneralSettings { language: DEFAULT_LANGUAGE.into(), navigation_type: NavigationType::default(), middle_mouse_pan: false, + hold_v_to_orbit: true, orbit_speed: 1., pan_speed: 1., zoom_speed: 1., @@ -418,6 +421,8 @@ impl BenchUpApp { .response }, ); + ui.checkbox(&mut self.general_settings.hold_v_to_orbit, tr!("settings.hold_v_to_orbit")); + ui.text_weak(tr!("settings.hold_v_to_orbit_hint")); } if navigation_type == NavigationType::SpaceMouse { let space_mouse = &mut self.general_settings.space_mouse; diff --git a/crates/benchup-app/src/shortcuts.rs b/crates/benchup-app/src/shortcuts.rs index 37d1359..b8884ff 100644 --- a/crates/benchup-app/src/shortcuts.rs +++ b/crates/benchup-app/src/shortcuts.rs @@ -91,7 +91,7 @@ impl BenchUpApp { .map(|(action, keys)| (*action, (*keys).to_owned())) .collect(), }; - let sections = [ + let mut sections = [ section( "drawing_measuring", tr!("shortcuts.drawing_measuring"), @@ -291,6 +291,17 @@ impl BenchUpApp { ], ), ]; + if self.general_settings.hold_v_to_orbit + && let Some(navigation) = sections.iter_mut().find(|section| section.id == "navigation") + { + navigation.rows.splice( + 2..2, + [ + (tr!("shortcuts.orbit_from_any_tool"), tr!("shortcuts.hold_v_move_pointer").to_owned()), + (tr!("shortcuts.pan_from_any_tool"), tr!("shortcuts.hold_shift_v_move_pointer").to_owned()), + ], + ); + } let width = (ctx.content_rect().width() - 72.).clamp(80., 900.); let response = Modal::new("keyboard_shortcuts", 940.).show(ctx, |modal| { let mut filter_changed = false; diff --git a/crates/benchup-app/src/sidebar.rs b/crates/benchup-app/src/sidebar.rs index 4d52174..e09dcc0 100644 --- a/crates/benchup-app/src/sidebar.rs +++ b/crates/benchup-app/src/sidebar.rs @@ -297,6 +297,27 @@ mod guide_preference_tests { assert_eq!(restored.general_settings.walk, app.general_settings.walk); } + #[test] + fn hold_v_to_orbit_defaults_on_and_saves_without_a_model_edit() { + let old: InspectorPreferences = + serde_json::from_str(r#"{"general":{"middle_mouse_pan":true}}"#).unwrap(); + assert!(old.general.hold_v_to_orbit); + let ctx = egui::Context::default(); + let mut app = BenchUpApp::with_document(Document::default(), None, true); + assert!(app.general_settings.hold_v_to_orbit); + let mut storage = Storage::default(); + for enabled in [false, true] { + app.general_settings.hold_v_to_orbit = enabled; + storage.flushed = false; + app.persist_inspector_changes(&ctx, Some(&mut storage), false); + assert!(storage.flushed); + assert!(!app.project.modified); + let mut restored = BenchUpApp::with_document(Document::default(), None, true); + restored.restore_inspector_preferences(&egui::Context::default(), Some(&storage)); + assert_eq!(restored.general_settings.hold_v_to_orbit, enabled); + } + } + #[test] fn walk_speed_defaults_and_saves_immediately_without_a_model_edit() { let old: InspectorPreferences = serde_json::from_str(