From 9a3a10c8b43e51471f74f79dfbef66b3f69ea0f5 Mon Sep 17 00:00:00 2001 From: Emilia Date: Tue, 24 Oct 2023 16:21:30 -0400 Subject: [PATCH] Transfer region no longer copy --- src/components/transfer_menu.rs | 2 +- src/data/transfer_region.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/transfer_menu.rs b/src/components/transfer_menu.rs index 604fe7a..f17b71c 100644 --- a/src/components/transfer_menu.rs +++ b/src/components/transfer_menu.rs @@ -192,7 +192,7 @@ pub fn TransferMenu() -> Html { let new_transfer = Transfer::new( spi.clone(), dpi.clone(), - ct_state.transfer.transfer_region, + ct_state.transfer.transfer_region.clone(), ct_state.transfer.name.clone(), ); main_dispatch.reduce_mut(|state| { diff --git a/src/data/transfer_region.rs b/src/data/transfer_region.rs index c940e2a..301aa92 100644 --- a/src/data/transfer_region.rs +++ b/src/data/transfer_region.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use super::plate::Plate; -#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Debug)] +#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)] pub enum Region { Rect((u8, u8), (u8, u8)), Point((u8, u8)), @@ -24,7 +24,7 @@ impl TryFrom for ((u8, u8), (u8, u8)) { } } -#[derive(PartialEq, Eq, Clone, Copy, Serialize, Deserialize, Debug)] +#[derive(PartialEq, Eq, Clone, Serialize, Deserialize, Debug)] pub struct TransferRegion { pub source_plate: Plate, pub source_region: Region, // Even if it is just a point, we don't want corners.