Skip to content

Refine navigate tool zoom #461

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

Merged
Keavon merged 13 commits into from
Jan 8, 2022
Merged

Refine navigate tool zoom #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ed5a8f5
Snap zoom
0HyperCube Jan 4, 2022
585e1e2
Navigate zoom from centre
0HyperCube Jan 4, 2022
aed5d04
Ctrl to snap zoom in navigate
0HyperCube Jan 4, 2022
2a995bd
Use ctrl for global snap rotate
0HyperCube Jan 4, 2022
3100d6b
Fix the rotation input on snap rotate
0HyperCube Jan 4, 2022
aca46b8
Merge branch 'master' into 488refine-navigate-zoom
Keavon Jan 5, 2022
ef283b4
Merge branch 'master' into 488refine-navigate-zoom
Keavon Jan 5, 2022
b7ed91c
Update hint to use ctrl
0HyperCube Jan 5, 2022
9e1d6ec
Fix mouse centre on drag
0HyperCube Jan 5, 2022
39db442
Click to zoom in
0HyperCube Jan 5, 2022
9f4b2a1
Clean up centre zoom
0HyperCube Jan 5, 2022
f882a81
Update user input hints; tweak some variable names for clarity and st…
Keavon Jan 6, 2022
cd88ae3
Merge remote-tracking branch 'origin/master' into 488refine-navigate-…
Keavon Jan 8, 2022
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
9 changes: 4 additions & 5 deletions editor/src/document/document_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,9 +859,8 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
);
responses.push_back(ArtboardMessage::RenderArtboards.into());

let document_transform = &self.movement_handler;

let scale = 0.5 + ASYMPTOTIC_EFFECT + document_transform.scale * SCALE_EFFECT;
let document_transform_scale = self.movement_handler.snapped_scale();
let scale = 0.5 + ASYMPTOTIC_EFFECT + document_transform_scale * SCALE_EFFECT;
let viewport_size = ipp.viewport_bounds.size();
let viewport_mid = ipp.viewport_bounds.center();
let [bounds1, bounds2] = self.graphene_document.visible_layers_bounding_box().unwrap_or([viewport_mid; 2]);
Expand All @@ -872,9 +871,9 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
let scrollbar_multiplier = bounds_length - viewport_size;
let scrollbar_size = viewport_size / bounds_length;

let log = document_transform.scale.log2();
let log = document_transform_scale.log2();
let ruler_interval = if log < 0. { 100. * 2_f64.powf(-log.ceil()) } else { 100. / 2_f64.powf(log.ceil()) };
let ruler_spacing = ruler_interval * document_transform.scale;
let ruler_spacing = ruler_interval * document_transform_scale;

let ruler_origin = self.graphene_document.root.transform.transform_point2(DVec2::ZERO);

Expand Down
Loading