Skip to content

Prevent auto-panning in Pen/Spline tools while drawing without dragging #2463

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Apr 14, 2025
Merged

Prevent auto-panning in Pen/Spline tools while drawing without dragging #2463

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7913135
don't autopann when mouse up
0SlowPoke0 Mar 18, 2025
ff56e0c
Merge branch 'master' into pen-spline-autopanning
0SlowPoke0 Mar 18, 2025
10d9743
Merge branch 'master' into pen-spline-autopanning
Keavon Mar 20, 2025
d06de48
Merge branch 'GraphiteEditor:master' into pen-spline-autopanning
0SlowPoke0 Apr 14, 2025
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
4 changes: 4 additions & 0 deletions editor/src/messages/tool/tool_messages/pen_tool.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use super::tool_prelude::*;
use crate::consts::{DEFAULT_STROKE_WIDTH, HIDE_HANDLE_DISTANCE, LINE_ROTATE_SNAP_ANGLE};
use crate::messages::input_mapper::utility_types::input_mouse::MouseKeys;
use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type;
use crate::messages::portfolio::document::overlays::utility_functions::path_overlays;
use crate::messages::portfolio::document::overlays::utility_types::{DrawHandles, OverlayContext};
@@ -1876,6 +1877,9 @@ impl Fsm for PenToolFsmState {
PenToolFsmState::DraggingHandle(mode)
}
(PenToolFsmState::PlacingAnchor, PenToolMessage::PointerOutsideViewport { .. }) => {
if !input.mouse.mouse_keys.contains(MouseKeys::LEFT) {
return self;
}
// Auto-panning
let _ = tool_data.auto_panning.shift_viewport(input, responses);

4 changes: 4 additions & 0 deletions editor/src/messages/tool/tool_messages/spline_tool.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use super::tool_prelude::*;
use crate::consts::{DEFAULT_STROKE_WIDTH, DRAG_THRESHOLD, PATH_JOIN_THRESHOLD, SNAP_POINT_TOLERANCE};
use crate::messages::input_mapper::utility_types::input_mouse::MouseKeys;
use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type;
use crate::messages::portfolio::document::overlays::utility_functions::path_endpoint_overlays;
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
@@ -406,6 +407,9 @@ impl Fsm for SplineToolFsmState {
self
}
(SplineToolFsmState::Drawing, SplineToolMessage::PointerOutsideViewport) => {
if !input.mouse.mouse_keys.contains(MouseKeys::LEFT) {
return self;
}
// Auto-panning
let _ = tool_data.auto_panning.shift_viewport(input, responses);

Loading