From cebf1b30cb616f458b44d3fb2a5ba7713c95d8c8 Mon Sep 17 00:00:00 2001 From: sdasda7777 <17746796+sdasda7777@users.noreply.github.com> Date: Sun, 24 Mar 2024 11:29:24 +0100 Subject: [PATCH] Maybe fixed clipboard and dragvalues --- .cargo/config.toml | 3 +++ src/main.rs | 19 ++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..661cd50 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,3 @@ + +[target.wasm32-unknown-unknown] +rustflags = ["--cfg=web_sys_unstable_apis"] diff --git a/src/main.rs b/src/main.rs index 4a5cfd6..1995dd0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1150,21 +1150,18 @@ Code written by sdasda7777 (github.com/sdasda7777) (except where noted otherwise } } } + // TODO: accept zoom_delta() // Zoom/unzoom if painter_response.hovered() { - let delta = ctx.input(|i| i.raw_scroll_delta); - //println!("{:?}", delta.y); - if delta.y > 0.0 && (self.zoom_factor < 5.0 || self.unlimited_zoom) { - if let Some(pos) = ctx.pointer_interact_pos() { - let old_factor = self.zoom_factor; - self.zoom_factor *= 1.5; - self.view_origin.x -= ((pos.x - self.view_origin.x) / old_factor) * (self.zoom_factor - old_factor); - self.view_origin.y -= ((pos.y - self.view_origin.y) / old_factor) * (self.zoom_factor - old_factor); - } - } else if delta.y < 0.0 && (self.zoom_factor > 0.01 || self.unlimited_zoom) { + let scroll_delta = ctx.input(|i| i.raw_scroll_delta); + //println!("{:?}", scroll_delta.y); + + let factor = if scroll_delta.y > 0.0 && (self.zoom_factor < 5.0 || self.unlimited_zoom) { 1.5 } else if scroll_delta.y < 0.0 && (self.zoom_factor > 0.01 || self.unlimited_zoom) { 0.66 } else { 0.0 }; + + if factor != 0.0 { if let Some(pos) = ctx.pointer_interact_pos() { let old_factor = self.zoom_factor; - self.zoom_factor /= 1.5; + self.zoom_factor *= factor; self.view_origin.x -= ((pos.x - self.view_origin.x) / old_factor) * (self.zoom_factor - old_factor); self.view_origin.y -= ((pos.y - self.view_origin.y) / old_factor) * (self.zoom_factor - old_factor); }