Skip to content

Commit 57a6201

Browse files
fix footprint
Co-authored-by: James Lindsay <78500760+0HyperCube@users.noreply.github.com>
1 parent baae8b9 commit 57a6201

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

editor/src/messages/portfolio/portfolio_message_handler.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,20 +1187,21 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
11871187
return;
11881188
};
11891189

1190-
let document_to_viewport = document
1191-
.navigation_handler
1192-
.calculate_offset_transform(viewport.center_in_viewport_space().into(), &document.document_ptz);
1193-
let pointer_position = document_to_viewport.inverse().transform_point2(ipp.mouse.position);
1194-
11951190
const PREVIEW_RESOLUTION: u32 = 11;
11961191
let resolution = glam::UVec2::splat(PREVIEW_RESOLUTION);
1197-
let pointer_offset = -(glam::DVec2::splat(PREVIEW_RESOLUTION as f64 / 2.0) / document.document_ptz.zoom());
11981192

1199-
let pointer_position = pointer_position + pointer_offset;
1193+
let preview_offset_in_viewport = ipp.mouse.position - (glam::DVec2::splat(PREVIEW_RESOLUTION as f64 / 2.0));
1194+
let preview_offset_in_viewport = DAffine2::from_translation(preview_offset_in_viewport);
1195+
1196+
let document_to_viewport = document.metadata().document_to_viewport;
1197+
1198+
let preview_transform = preview_offset_in_viewport.inverse() * document_to_viewport;
1199+
1200+
let pointer_position = document_to_viewport.inverse().transform_point2(ipp.mouse.position);
12001201

12011202
let result = self
12021203
.executor
1203-
.submit_eyedropper_preview(document_id, resolution, document.document_ptz.zoom(), timing_information, pointer_position);
1204+
.submit_eyedropper_preview(document_id, preview_transform, resolution, timing_information, pointer_position);
12041205

12051206
match result {
12061207
Err(description) => {

editor/src/node_graph_executor.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,15 @@ impl NodeGraphExecutor {
194194
}
195195

196196
#[cfg(not(target_family = "wasm"))]
197-
pub(crate) fn submit_eyedropper_preview(&mut self, document_id: DocumentId, resolution: UVec2, zoom: f64, time: TimingInformation, pointer: DVec2) -> Result<Message, String> {
198-
let transform = DAffine2::from_translation(pointer).inverse();
199-
197+
pub(crate) fn submit_eyedropper_preview(&mut self, document_id: DocumentId, transform: DAffine2, resolution: UVec2, time: TimingInformation, pointer: DVec2) -> Result<Message, String> {
200198
let viewport = Footprint {
201199
transform,
202200
resolution,
203201
..Default::default()
204202
};
205203
let render_config = RenderConfig {
206204
viewport,
207-
scale: zoom,
205+
scale: 1.,
208206
time,
209207
pointer,
210208
export_format: graphene_std::application_io::ExportFormat::Raster,

0 commit comments

Comments
 (0)