Skip to content

Improve robustness when panning/tilting/zooming during dragging actions #3526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nikhil-nari wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Draft

Improve robustness when panning/tilting/zooming during dragging actions #3526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions editor/src/messages/tool/tool_messages/select_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use super::tool_prelude::*;
use crate::consts::*;
use crate::messages::input_mapper::utility_types::input_mouse::ViewportPosition;
use crate::messages::input_mapper::utility_types::input_mouse::{ViewportPosition, MouseKeys};
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
Expand Down Expand Up @@ -606,6 +606,7 @@ impl Fsm for SelectToolFsmState {

let ToolMessage::Select(event) = event else { return self };
match (self, event) {
(SelectToolFsmState::Dragging { .. }, SelectToolMessage::Overlays { .. }) => self,
(_, SelectToolMessage::Overlays { context: mut overlay_context }) => {
tool_data.snap_manager.draw_overlays(SnapData::new(document, input, viewport), &mut overlay_context);

Expand Down Expand Up @@ -1393,8 +1394,11 @@ impl Fsm for SelectToolFsmState {

state
}
(SelectToolFsmState::Dragging { has_dragged, remove, deepest, .. }, SelectToolMessage::DragStop { remove_from_selection }) => {
(SelectToolFsmState::Dragging { has_dragged, remove, deepest, axis, using_compass }, SelectToolMessage::DragStop { remove_from_selection }) => {
// Deselect layer if not snap dragging
if input.mouse.mouse_keys.contains(MouseKeys::LEFT) {
return SelectToolFsmState::Dragging { has_dragged, remove, deepest, axis, using_compass };
}
responses.add(DocumentMessage::EndTransaction);
tool_data.axis_align = false;

Expand Down