SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Navigation: a middle or right drag keeps the mode it started with (#9557) (#9592)
austin62jake9602587b0d33
diff --git a/assets/locales/pending/drag-keeps-nav-mode.json b/assets/locales/pending/drag-keeps-nav-mode.jsonnew file mode 100644index 0000000000..9b883e2bf0--- /dev/null+++ b/assets/locales/pending/drag-keeps-nav-mode.json@@ -0,0 +1,34 @@+{+ "ar": {+ "nav.drag_keeps_mode.help": "يستمر السحب بالزر الأوسط أو الأيمن في التدوير أو التحريك أو التكبير كما بدأ حتى تحرير الزر، مهما ضُغطت المفاتيح أو حُرّرت في أثناء ذلك. عند الإيقاف: تقرر المفاتيح المضغوطة في كل لحظة من السحب.",+ "nav.drag_keeps_mode.label": "يحتفظ السحب بطريقة التنقل التي بدأ بها"+ },+ "de": {+ "nav.drag_keeps_mode.help": "Ein Ziehen mit der mittleren oder rechten Taste dreht, verschiebt oder zoomt weiter wie begonnen, bis die Taste losgelassen wird, egal welche Tasten dabei gedrückt oder losgelassen werden. Aus: Die gehaltenen Tasten entscheiden in jedem Moment des Ziehens.",+ "nav.drag_keeps_mode.label": "Ziehen behält die Navigation bei, mit der es begann"+ },+ "en": {+ "nav.drag_keeps_mode.help": "A middle or right drag goes on orbiting, panning or zooming as it began until the button is released, whatever keys are pressed or let go meanwhile. Off: the keys held decide at every moment of the drag.",+ "nav.drag_keeps_mode.label": "A drag keeps the navigation it started with"+ },+ "he": {+ "nav.drag_keeps_mode.help": "גרירה בכפתור האמצעי או הימני ממשיכה לסובב, להזיז או לשנות זום כפי שהתחילה עד שמשחררים את הכפתור, בלי קשר למקשים שנלחצים או משתחררים בינתיים. כבוי: המקשים הלחוצים קובעים בכל רגע של הגרירה.",+ "nav.drag_keeps_mode.label": "גרירה שומרת על הניווט שבו התחילה"+ },+ "ja": {+ "nav.drag_keeps_mode.help": "中ボタンまたは右ボタンのドラッグは、途中でキーを押したり離したりしても、ボタンを離すまで開始時の回転・パン・ズームを続けます。オフにすると、ドラッグ中の各時点で押しているキーによって決まります。",+ "nav.drag_keeps_mode.label": "ドラッグは開始時のナビゲーションを維持"+ },+ "ko": {+ "nav.drag_keeps_mode.help": "가운데 또는 오른쪽 버튼 드래그는 도중에 키를 누르거나 떼어도 버튼을 놓을 때까지 시작할 때의 회전, 이동 또는 확대/축소를 계속합니다. 끄면 드래그하는 동안 누르고 있는 키가 매 순간 결정합니다.",+ "nav.drag_keeps_mode.label": "드래그는 시작할 때의 탐색 방식을 유지"+ },+ "vi": {+ "nav.drag_keeps_mode.help": "Kéo bằng nút giữa hoặc nút phải sẽ tiếp tục xoay, di chuyển hoặc thu phóng như lúc bắt đầu cho đến khi nhả nút, dù trong lúc đó có nhấn hay nhả phím nào. Tắt: các phím đang giữ quyết định ở mọi thời điểm của thao tác kéo.",+ "nav.drag_keeps_mode.label": "Thao tác kéo giữ nguyên kiểu điều hướng lúc bắt đầu"+ },+ "zh": {+ "nav.drag_keeps_mode.help": "中键或右键拖动会保持开始时的旋转、平移或缩放,直到松开按键,期间按下或松开任何键都不会改变。关闭后:拖动的每一刻都由当时按住的键决定。",+ "nav.drag_keeps_mode.label": "拖动保持开始时的导航方式"+ }+}diff --git a/crates/ui-egui/src/navigation.rs b/crates/ui-egui/src/navigation.rsindex 76cc3eab22..eac68d19f8 100644--- a/crates/ui-egui/src/navigation.rs+++ b/crates/ui-egui/src/navigation.rs@@ -748,6 +748,23 @@ pub(crate) fn handle(app: &mut SolveApp, ui: &mut egui::Ui, rect: Rect, resp: &e// floating shell card that disables the underlying egui response.let captured_orbit = app.viewport.orbit_from.is_some() && button.is_some();let dragging = resp.dragged() || (inside && button.is_some()) || captured_orbit;+ // A middle or right drag keeps the mode it started with until its button is released, as a+ // left one does (`primary_nav`): letting go of Shift partway through a Shift+middle orbit+ // doesn't turn the rest into a pan (#9557). Off in Preferences, the keys held decide on every+ // frame, as before.+ let button_mode = match button {+ Some(b) if dragging && app.viewport.axis_drag.is_none() => {+ let kept = app.viewport.button_nav.filter(|(held, _)| *held == b && app.preferences.nav_drag_keeps_mode);+ let mode = kept.map_or_else(|| crate::prefs::nav_mode(app, b, mods), |(_, mode)| mode);+ app.viewport.button_nav = Some((b, mode));+ mode+ }+ Some(_) => None,+ None => {+ app.viewport.button_nav = None;+ None+ }+ };// Without orbit (a flat page), bindings that orbit do nothing.let allowed = |m: NavMode| caps.orbit || m != NavMode::Orbit;let motion = modifier_motion(app, ui, inside, hover, mods, picking).filter(|(m, _)| allowed(*m));@@ -756,7 +773,7 @@ pub(crate) fn handle(app: &mut SolveApp, ui: &mut egui::Ui, rect: Rect, resp: &e.or_else(|| {if dragging && app.viewport.axis_drag.is_none() {match button {- Some(b) => crate::prefs::nav_mode(app, b, mods),+ Some(_) => button_mode,// A press held still that opened Select Other stays its own: egui calls it a// drag after 0.8 s, and moving to a row must not turn the view under the list.None if primary_down && !crate::select_other::is_open(app) => primary_nav,diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rsindex 2f89b26002..cfe3a26206 100644--- a/crates/ui-egui/src/prefs.rs+++ b/crates/ui-egui/src/prefs.rs@@ -1059,6 +1059,10 @@ preference_settings! {free_orbit_upright: bool = false, PAGE_NAVIGATION => check_tr("nav.free_orbit_upright.label");/// Off: a right drag that the mouse mapping would orbit leaves the camera alone (#6492).right_drag_orbits: bool = true, PAGE_NAVIGATION => check_tr("nav.right_drag_orbits.label");+ /// A middle or right drag keeps the mode it started with until its button is released, as a+ /// left drag with the mapping's keys does: letting go of Shift partway through a Shift+middle+ /// orbit doesn't turn it into a pan (#9557). Off: the keys held decide on every frame, as before.+ nav_drag_keeps_mode: bool = true, PAGE_NAVIGATION => check_tr("nav.drag_keeps_mode.label");/// View orientation widget: original signed axes (default) or compact cube.navigator_style: NavigatorStyle = NavigatorStyle::default(), PAGE_NAVIGATION;/// The custom view gizmo's colours: the cube's (themed) or the body's own (modeled).diff --git a/crates/ui-egui/src/prefs/navigation.rs b/crates/ui-egui/src/prefs/navigation.rsindex 5680eccbfe..a015d60e2d 100644--- a/crates/ui-egui/src/prefs/navigation.rs+++ b/crates/ui-egui/src/prefs/navigation.rs@@ -110,6 +110,8 @@ fn mouse(app: &mut SolveApp, ui: &mut egui::Ui, t: &Tokens) {let response = setting::right_drag_orbits(app, ui).backing_on_hover_text(crate::i18n::tr("nav.right_drag_orbits.help"));crate::scenario::publish_target("prefs:right_drag_orbits", response.rect);}+ let keeps = setting::nav_drag_keeps_mode(app, ui).backing_on_hover_text(crate::i18n::tr("nav.drag_keeps_mode.help"));+ crate::scenario::publish_target("prefs:nav_drag_keeps_mode", keeps.rect);setting::radial_context_menu(app, ui).backing_on_hover_text(crate::i18n::tr("prefs.navigation.radial_help"));let label = app.tr("Middle double-click");let width = ui_kit::ContentWidth::label(ui, label);diff --git a/crates/ui-egui/src/viewport.rs b/crates/ui-egui/src/viewport.rsindex 3816aedae4..844b4dc263 100644--- a/crates/ui-egui/src/viewport.rs+++ b/crates/ui-egui/src/viewport.rs@@ -170,6 +170,9 @@ pub struct ViewportState {pub primary_nav: Option<NavMode>,/// Button-free gesture and its last owned pointer position, kept through pauses.pub(crate) modifier_nav: Option<(NavMode, Pos2)>,+ /// The mode the middle or right drag under way started with, kept until its button is+ /// released when `nav_drag_keeps_mode` is on (#9557).+ pub(crate) button_nav: Option<(crate::prefs::NavButton, Option<NavMode>)>,/// What a click would pick now (after the active command's filter).pub hover: Option<Hit>,/// The centre of the circle or arc of the sketch being edited whose edge was hovered last@@ -12027,6 +12030,56 @@ mod tests {}}+ /// Shift let go partway through a Shift+middle orbit (Fusion): the rest of the drag still+ /// orbits (#9557), and Shift pressed partway through a middle pan still pans. With+ /// `nav_drag_keeps_mode` off, the keys held decide on every frame, as before.+ #[test]+ fn a_middle_drag_keeps_its_mode_when_shift_changes() {+ let shift = egui::Modifiers { shift: true, ..Default::default() };+ let send = |h: &mut crate::scenario::Harness, e: egui::Event| {+ h.app.synthetic.push(e);+ h.frame();+ };+ for keeps in [true, false] {+ for (first, then) in [(shift, egui::Modifiers::NONE), (egui::Modifiers::NONE, shift)] {+ let mut h = crate::scenario::Harness::new();+ h.app.preferences.nav_drag_keeps_mode = keeps;+ h.call("ui.view", json!({"view":"front"}));+ let start = h.app.cam;+ let at = h.app.viewport.rect.unwrap().center();+ send(&mut h, egui::Event::ModifiersChanged(first));+ send(&mut h, egui::Event::PointerMoved(at));+ send(&mut h, egui::Event::PointerButton { pos: at, button: egui::PointerButton::Middle, pressed: true, modifiers: first });+ for i in 1..=10 {+ send(&mut h, egui::Event::PointerMoved(at + vec2(4.0 * i as f32, 0.0)));+ }+ let half = h.app.cam;+ send(&mut h, egui::Event::ModifiersChanged(then));+ for i in 11..=20 {+ send(&mut h, egui::Event::PointerMoved(at + vec2(4.0 * i as f32, 0.0)));+ }+ send(+ &mut h,+ egui::Event::PointerButton { pos: at + vec2(80.0, 0.0), button: egui::PointerButton::Middle, pressed: false, modifiers: then },+ );+ let end = h.app.cam;+ // Fusion: Shift+middle orbits, middle alone pans.+ let case = format!("keeps={keeps}, Shift {} partway", if first.shift { "let go" } else { "pressed" });+ let moved = |a: Camera, b: Camera, orbit: bool| {+ if orbit {+ assert_ne!(a.yaw, b.yaw, "{case}: orbits");+ assert_eq!(a.target, b.target, "{case}: doesn't pan");+ } else {+ assert_eq!(a.yaw, b.yaw, "{case}: doesn't orbit");+ assert_ne!(a.target, b.target, "{case}: pans");+ }+ };+ moved(start, half, first.shift);+ moved(half, end, if keeps { first.shift } else { then.shift });+ }+ }+ }+#[test]fn navigation_cube_repeated_face_click_keeps_view_and_drag_snaps() {let mut h = crate::scenario::Harness::new();