From 3449cfda7a8c8ae2be4fd27ff44bab9b6504ed40 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Mon, 21 Jun 2021 23:43:17 -0700 Subject: [PATCH] port forward scrolling fix --- src/renderer/rendered_window.rs | 2 +- src/window/window_wrapper/mouse_manager.rs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/renderer/rendered_window.rs b/src/renderer/rendered_window.rs index abdac86..7735d02 100644 --- a/src/renderer/rendered_window.rs +++ b/src/renderer/rendered_window.rs @@ -119,7 +119,7 @@ pub struct RenderedWindow { scroll_t: f32, } -#[derive(Clone)] +#[derive(Clone, Debug)] pub struct WindowDrawDetails { pub id: u64, pub region: Rect, diff --git a/src/window/window_wrapper/mouse_manager.rs b/src/window/window_wrapper/mouse_manager.rs index 51d0058..5eded2a 100644 --- a/src/window/window_wrapper/mouse_manager.rs +++ b/src/window/window_wrapper/mouse_manager.rs @@ -18,6 +18,8 @@ use glutin::{ use crate::channel_utils::LoggingTx; use crate::bridge::UiCommand; use crate::renderer::{Renderer, WindowDrawDetails}; +use crate::settings::SETTINGS; +use crate::window::WindowSettings; pub struct MouseManager { command_sender: LoggingTx, @@ -148,9 +150,11 @@ impl MouseManager { return; } + let scroll_dead_zone = SETTINGS.get::().scroll_dead_zone; + let vertical_input_type = match y { - _ if y > 1.8 => Some("up"), - _ if y < -1.8 => Some("down"), + _ if y > scroll_dead_zone => Some("up"), + _ if y < -scroll_dead_zone => Some("down"), _ => None, }; @@ -165,8 +169,8 @@ impl MouseManager { } let horizontal_input_type = match x { - _ if x > 1.8 => Some("right"), - _ if x < -1.8 => Some("left"), + _ if x > scroll_dead_zone => Some("right"), + _ if x < -scroll_dead_zone => Some("left"), _ => None, };