Fix scale in GTK wheel event handler.

linebender · May 9, 2020 · a12357a · a12357a
1 parent 57eb993
commit a12357a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/druid-shell/src/platform/gtk/window.rs b/druid-shell/src/platform/gtk/window.rs
@@ -408,8 +408,7 @@ impl WindowBuilder {
 
         win_state.drawing_area.connect_scroll_event(clone!(handle => move |_widget, scroll| {
             if let Some(state) = handle.state.upgrade() {
-                if let Ok(mut handler) = state.handler.try_borrow_mut() {
-
+                if let Ok(scale) = state.scale.try_borrow() {
                     let mods = get_modifiers(scroll.get_state());
 
                     // The magic "120"s are from Microsoft's documentation for WM_MOUSEWHEEL.
@@ -441,8 +440,8 @@ impl WindowBuilder {
                         }
                     };
 
-                    if let Some(wheel_delta) = wheel_delta{
-                        let mouse_event = MouseEvent{
+                    if let Some(wheel_delta) = wheel_delta {
+                        let mouse_event = MouseEvent {
                             pos: scale.to_dp(&Point::from(scroll.get_position())),
                             buttons: get_mouse_buttons_from_modifiers(scroll.get_state()),
                             mods,
@@ -451,10 +450,14 @@ impl WindowBuilder {
                             wheel_delta
                         };
 
-                        handler.wheel(&mouse_event);
+                        if let Ok(mut handler) = state.handler.try_borrow_mut() {
+                            handler.wheel(&mouse_event);
+                        } else {
+                            log::info!("GTK event was dropped because the handler was already borrowed");
+                        }
                     }
                 } else {
-                    log::info!("GTK event was dropped because the handler was already borrowed");
+                    log::warn!("GTK event was dropped because the scale was already borrowed");
                 }
             }