Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub enum NavigationMessage {
BeginCanvasTilt { was_dispatched_from_menu: bool },
BeginCanvasZoom,
CanvasPan { delta: DVec2 },
CanvasPanSet { position: DVec2 },
CanvasPanAbortPrepare { x_not_y_axis: bool },
CanvasPanAbort { x_not_y_axis: bool },
CanvasPanByViewportFraction { delta: DVec2 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,20 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Grabbing });

responses.add(FrontendMessage::UpdateInputHints {
hint_data: HintData(vec![HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()])]),
hint_data: HintData(vec![
HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()]),
HintGroup(vec![HintInfo::keys([Key::Shift], "Constrain to Axis")]),
]),
});

self.mouse_position = ipp.mouse.position;
let Some(ptz) = get_ptz(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
return;
};
self.navigation_operation = NavigationOperation::Pan { pan_original_for_abort: ptz.pan };
self.navigation_operation = NavigationOperation::Pan {
pan_original_for_abort: ptz.pan,
pan_raw_viewport_delta: DVec2::ZERO,
};
}
NavigationMessage::BeginCanvasTilt { was_dispatched_from_menu } => {
let Some(ptz) = get_ptz(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
Expand Down Expand Up @@ -142,6 +148,16 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
responses.add(EventMessage::CanvasTransformed);
responses.add(DocumentMessage::PTZUpdate);
}
NavigationMessage::CanvasPanSet { position } => {
let Some(ptz) = get_ptz_mut(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
log::error!("Could not get PTZ in CanvasPanSet");
return;
};

ptz.pan = position;
responses.add(EventMessage::CanvasTransformed);
responses.add(DocumentMessage::PTZUpdate);
}
NavigationMessage::CanvasPanAbortPrepare { x_not_y_axis } => {
let Some(ptz) = get_ptz_mut(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
log::error!("Could not get PTZ in CanvasPanAbortPrepare");
Expand Down Expand Up @@ -407,9 +423,29 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
NavigationMessage::PointerMove { snap } => {
match self.navigation_operation {
NavigationOperation::None => {}
NavigationOperation::Pan { .. } => {
NavigationOperation::Pan {
pan_original_for_abort,
pan_raw_viewport_delta,
} => {
let delta = ipp.mouse.position - self.mouse_position;
responses.add(NavigationMessage::CanvasPan { delta });

let pan_raw_viewport_delta = pan_raw_viewport_delta + delta;

self.navigation_operation = NavigationOperation::Pan {
pan_original_for_abort,
pan_raw_viewport_delta,
};

let mut locked_delta = pan_raw_viewport_delta;

if ipp.keyboard.get(snap as usize) {
if locked_delta.x.abs() >= locked_delta.y.abs() { locked_delta.y = 0. } else { locked_delta.x = 0. }
}

let document_to_viewport = self.calculate_offset_transform(ipp.viewport_bounds.center(), ptz);
let new_pan = pan_original_for_abort + document_to_viewport.inverse().transform_vector2(locked_delta);

responses.add(NavigationMessage::CanvasPanSet { position: new_pan });
}
NavigationOperation::Tilt {
tilt_raw_not_snapped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub enum NavigationOperation {
None,
Pan {
pan_original_for_abort: DVec2,
pan_raw_viewport_delta: DVec2,
},
Tilt {
tilt_original_for_abort: f64,
Expand Down