do not expose mouse_event method

tauri-apps · Jan 16, 2023 · ee3cf74 · ee3cf74
1 parent ec69900
commit ee3cf74
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/.changes/linux-mouse.md b/.changes/linux-mouse.md
@@ -2,5 +2,4 @@
 "tauri-runtime-wry": patch
 ---
 
-On Linux, disable mouse event when creating windows with `with_config`.
-
+Disable cursor mouse events on Linux.
diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
@@ -753,7 +753,7 @@ impl WindowBuilder for WindowBuilderWrapper {
     #[cfg(target_os = "linux")]
     {
       // Mouse event is disabled on Linux since sudden event bursts could block event loop.
-      window = window.mouse_event(false);
+      window.inner = window.inner.with_cursor_moved_event(false);
     }
 
     if let (Some(min_width), Some(min_height)) = (config.min_width, config.min_height) {
@@ -956,12 +956,6 @@ impl WindowBuilder for WindowBuilderWrapper {
   fn get_menu(&self) -> Option<&Menu> {
     self.menu.as_ref()
   }
-
-  #[cfg(target_os = "linux")]
-  fn mouse_event(mut self, enable: bool) -> Self {
-    self.inner = self.inner.with_cursor_moved_event(enable);
-    self
-  }
 }
 
 pub struct FileDropEventWrapper(WryFileDropEvent);

diff --git a/core/tauri-runtime/src/webview.rs b/core/tauri-runtime/src/webview.rs
@@ -250,11 +250,6 @@ pub trait WindowBuilder: WindowBuilderBase {
 
   /// Gets the window menu.
   fn get_menu(&self) -> Option<&Menu>;
-
-  /// Disables mouse events on Linux.
-  #[cfg(target_os = "linux")]
-  #[must_use]
-  fn mouse_event(self, enable: bool) -> Self;
 }
 
 /// IPC handler.

diff --git a/core/tauri/src/test/mock_runtime.rs b/core/tauri/src/test/mock_runtime.rs
@@ -303,11 +303,6 @@ impl WindowBuilder for MockWindowBuilder {
   fn get_menu(&self) -> Option<&Menu> {
     None
   }
-
-  #[cfg(target_os = "linux")]
-  fn mouse_event(self, enable: bool) -> Self {
-    self
-  }
 }
 
 impl<T: UserEvent> Dispatch<T> for MockDispatcher {