Skip to content

Commit b6d1494

Browse files
Fix warnings in test builds from previous pr
1 parent 3831c2a commit b6d1494

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

editor/src/messages/portfolio/document/overlays/overlays_message_handler.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ pub struct OverlaysMessageHandler {
2020
#[message_handler_data]
2121
impl MessageHandler<OverlaysMessage, OverlaysMessageContext<'_>> for OverlaysMessageHandler {
2222
fn process_message(&mut self, message: OverlaysMessage, responses: &mut VecDeque<Message>, context: OverlaysMessageContext) {
23-
let OverlaysMessageContext { visibility_settings, ipp, .. } = context;
24-
let device_pixel_ratio = context.device_pixel_ratio;
25-
2623
match message {
2724
#[cfg(target_family = "wasm")]
2825
OverlaysMessage::Draw => {
@@ -31,6 +28,9 @@ impl MessageHandler<OverlaysMessage, OverlaysMessageContext<'_>> for OverlaysMes
3128
use glam::{DAffine2, DVec2};
3229
use wasm_bindgen::JsCast;
3330

31+
let OverlaysMessageContext { visibility_settings, ipp, .. } = context;
32+
let device_pixel_ratio = context.device_pixel_ratio;
33+
3434
let canvas = match &self.canvas {
3535
Some(canvas) => canvas,
3636
None => {
@@ -68,11 +68,13 @@ impl MessageHandler<OverlaysMessage, OverlaysMessageContext<'_>> for OverlaysMes
6868
}
6969
}
7070
}
71-
#[cfg(test)]
72-
OverlaysMessage::Draw => {}
7371
#[cfg(all(not(target_family = "wasm"), not(test)))]
7472
OverlaysMessage::Draw => {
7573
use super::utility_types::OverlayContext;
74+
75+
let OverlaysMessageContext { visibility_settings, ipp, .. } = context;
76+
let device_pixel_ratio = context.device_pixel_ratio;
77+
7678
let size = ipp.viewport_bounds.size();
7779

7880
let overlay_context = OverlayContext::new(size, device_pixel_ratio, visibility_settings);
@@ -86,6 +88,8 @@ impl MessageHandler<OverlaysMessage, OverlaysMessageContext<'_>> for OverlaysMes
8688
}
8789
responses.add(FrontendMessage::RenderOverlays(overlay_context));
8890
}
91+
#[cfg(all(not(target_family = "wasm"), test))]
92+
OverlaysMessage::Draw => {}
8993
OverlaysMessage::AddProvider(message) => {
9094
self.overlay_providers.insert(message);
9195
}

editor/src/messages/portfolio/document/overlays/utility_types_vello.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ impl core::hash::Hash for OverlayContext {
198198
}
199199

200200
impl OverlayContext {
201+
#[cfg(not(test))]
201202
pub(super) fn new(size: DVec2, device_pixel_ratio: f64, visibility_settings: OverlaysVisibilitySettings) -> Self {
202203
Self {
203204
internal: Arc::new(Mutex::new(OverlayContextInternal::new(size, device_pixel_ratio, visibility_settings))),

0 commit comments

Comments
 (0)