fix(tauri-runtime-wry): wrong cfg usage on message handler

core/tauri-runtime-wry/src/lib.rs

@@ -2773,157 +2773,160 @@ fn handle_user_message<T: UserEvent>(
             }
           }
         }
-      } else {
-        let webview_handle = windows.0.borrow().get(&window_id).map(|w| {
-          (
-            w.inner.clone(),
-            w.webviews.iter().find(|w| w.id == webview_id).cloned(),
-          )
-        });
-        if let Some((Some(window), Some(webview))) = webview_handle {
-          match webview_message {
-            WebviewMessage::WebviewEvent(_) => { /* already handled */ }
-            WebviewMessage::SynthesizedWindowEvent(_) => { /* already handled */ }
-            WebviewMessage::Reparent(_window_id) => { /* already handled */ }
-            WebviewMessage::AddEventListener(id, listener) => {
-              webview
-                .webview_event_listeners
-                .lock()
-                .unwrap()
-                .insert(id, listener);
-            }
 
-            #[cfg(all(feature = "tracing", not(target_os = "android")))]
-            WebviewMessage::EvaluateScript(script, tx, span) => {
-              let _span = span.entered();
-              if let Err(e) = webview.evaluate_script(&script) {
-                debug_eprintln!("{}", e);
-              }
-              tx.send(()).unwrap();
-            }
-            #[cfg(not(all(feature = "tracing", not(target_os = "android"))))]
-            WebviewMessage::EvaluateScript(script) => {
-              if let Err(e) = webview.evaluate_script(&script) {
-                debug_eprintln!("{}", e);
-              }
-            }
-            WebviewMessage::Navigate(url) => webview.load_url(url.as_str()),
-            WebviewMessage::Print => {
-              let _ = webview.print();
-            }
-            WebviewMessage::Close => {
-              windows.0.borrow_mut().get_mut(&window_id).map(|window| {
-                if let Some(i) = window.webviews.iter().position(|w| w.id == webview.id) {
-                  window.webviews.remove(i);
-                }
-                window
-              });
-            }
-            WebviewMessage::SetSize(size) => {
-              let mut bounds = webview.bounds();
-              let size = size.to_logical(window.scale_factor());
-              bounds.width = size.width;
-              bounds.height = size.height;
-
-              if let Some(b) = &webview.bounds {
-                let window_size = window.inner_size();
-                let mut bounds = b.lock().unwrap();
-                bounds.width_rate = size.width as f32 / window_size.width as f32;
-                bounds.height_rate = size.height as f32 / window_size.height as f32;
-              }
+        return;
+      }
 
-              webview.set_bounds(bounds);
-            }
-            WebviewMessage::SetPosition(position) => {
-              let mut bounds = webview.bounds();
-              let position = position.to_logical(window.scale_factor());
-              bounds.x = position.x;
-              bounds.y = position.y;
-
-              if let Some(b) = &webview.bounds {
-                let window_size = window.inner_size();
-                let mut bounds = b.lock().unwrap();
-                bounds.width_rate = position.x as f32 / window_size.width as f32;
-                bounds.height_rate = position.y as f32 / window_size.height as f32;
-              }
+      let webview_handle = windows.0.borrow().get(&window_id).map(|w| {
+        (
+          w.inner.clone(),
+          w.webviews.iter().find(|w| w.id == webview_id).cloned(),
+        )
+      });
+      if let Some((Some(window), Some(webview))) = webview_handle {
+        match webview_message {
+          WebviewMessage::WebviewEvent(_) => { /* already handled */ }
+          WebviewMessage::SynthesizedWindowEvent(_) => { /* already handled */ }
+          WebviewMessage::Reparent(_window_id) => { /* already handled */ }
+          WebviewMessage::AddEventListener(id, listener) => {
+            webview
+              .webview_event_listeners
+              .lock()
+              .unwrap()
+              .insert(id, listener);
+          }
 
-              webview.set_bounds(bounds);
+          #[cfg(all(feature = "tracing", not(target_os = "android")))]
+          WebviewMessage::EvaluateScript(script, tx, span) => {
+            let _span = span.entered();
+            if let Err(e) = webview.evaluate_script(&script) {
+              debug_eprintln!("{}", e);
             }
-            // Getters
-            WebviewMessage::Url(tx) => {
-              tx.send(webview.url().parse().unwrap()).unwrap();
+            tx.send(()).unwrap();
+          }
+          #[cfg(not(all(feature = "tracing", not(target_os = "android"))))]
+          WebviewMessage::EvaluateScript(script) => {
+            if let Err(e) = webview.evaluate_script(&script) {
+              debug_eprintln!("{}", e);
             }
-            WebviewMessage::Position(tx) => {
-              let bounds = webview.bounds();
-              let position =
-                LogicalPosition::new(bounds.x, bounds.y).to_physical(window.scale_factor());
-              tx.send(position).unwrap();
+          }
+          WebviewMessage::Navigate(url) => webview.load_url(url.as_str()),
+          WebviewMessage::Print => {
+            let _ = webview.print();
+          }
+          WebviewMessage::Close => {
+            windows.0.borrow_mut().get_mut(&window_id).map(|window| {
+              if let Some(i) = window.webviews.iter().position(|w| w.id == webview.id) {
+                window.webviews.remove(i);
+              }
+              window
+            });
+          }
+          WebviewMessage::SetSize(size) => {
+            let mut bounds = webview.bounds();
+            let size = size.to_logical(window.scale_factor());
+            bounds.width = size.width;
+            bounds.height = size.height;
+
+            if let Some(b) = &webview.bounds {
+              let window_size = window.inner_size();
+              let mut bounds = b.lock().unwrap();
+              bounds.width_rate = size.width as f32 / window_size.width as f32;
+              bounds.height_rate = size.height as f32 / window_size.height as f32;
             }
-            WebviewMessage::Size(tx) => {
-              let bounds = webview.bounds();
-              let size =
-                LogicalSize::new(bounds.width, bounds.height).to_physical(window.scale_factor());
-              tx.send(size).unwrap();
+
+            webview.set_bounds(bounds);
+          }
+          WebviewMessage::SetPosition(position) => {
+            let mut bounds = webview.bounds();
+            let position = position.to_logical(window.scale_factor());
+            bounds.x = position.x;
+            bounds.y = position.y;
+
+            if let Some(b) = &webview.bounds {
+              let window_size = window.inner_size();
+              let mut bounds = b.lock().unwrap();
+              bounds.width_rate = position.x as f32 / window_size.width as f32;
+              bounds.height_rate = position.y as f32 / window_size.height as f32;
             }
-            WebviewMessage::SetFocus => {
-              webview.focus();
+
+            webview.set_bounds(bounds);
+          }
+          // Getters
+          WebviewMessage::Url(tx) => {
+            println!("url getter");
+            tx.send(webview.url().parse().unwrap()).unwrap();
+          }
+          WebviewMessage::Position(tx) => {
+            let bounds = webview.bounds();
+            let position =
+              LogicalPosition::new(bounds.x, bounds.y).to_physical(window.scale_factor());
+            tx.send(position).unwrap();
+          }
+          WebviewMessage::Size(tx) => {
+            let bounds = webview.bounds();
+            let size =
+              LogicalSize::new(bounds.width, bounds.height).to_physical(window.scale_factor());
+            tx.send(size).unwrap();
+          }
+          WebviewMessage::SetFocus => {
+            webview.focus();
+          }
+          WebviewMessage::WithWebview(f) => {
+            #[cfg(any(
+              target_os = "linux",
+              target_os = "dragonfly",
+              target_os = "freebsd",
+              target_os = "netbsd",
+              target_os = "openbsd"
+            ))]
+            {
+              f(webview.webview());
             }
-            WebviewMessage::WithWebview(f) => {
-              #[cfg(any(
-                target_os = "linux",
-                target_os = "dragonfly",
-                target_os = "freebsd",
-                target_os = "netbsd",
-                target_os = "openbsd"
-              ))]
-              {
-                f(webview.webview());
-              }
-              #[cfg(target_os = "macos")]
-              {
-                use wry::WebViewExtMacOS;
-                f(Webview {
-                  webview: webview.webview(),
-                  manager: webview.manager(),
-                  ns_window: webview.ns_window(),
-                });
-              }
-              #[cfg(target_os = "ios")]
-              {
-                use tao::platform::ios::WindowExtIOS;
-                use wry::WebViewExtIOS;
-
-                f(Webview {
-                  webview: webview.inner.webview(),
-                  manager: webview.inner.manager(),
-                  view_controller: window.ui_view_controller() as cocoa::base::id,
-                });
-              }
-              #[cfg(windows)]
-              {
-                f(Webview {
-                  controller: webview.controller(),
-                });
-              }
-              #[cfg(target_os = "android")]
-              {
-                f(webview.handle())
-              }
+            #[cfg(target_os = "macos")]
+            {
+              use wry::WebViewExtMacOS;
+              f(Webview {
+                webview: webview.webview(),
+                manager: webview.manager(),
+                ns_window: webview.ns_window(),
+              });
             }
+            #[cfg(target_os = "ios")]
+            {
+              use tao::platform::ios::WindowExtIOS;
+              use wry::WebViewExtIOS;
 
-            #[cfg(any(debug_assertions, feature = "devtools"))]
-            WebviewMessage::OpenDevTools => {
-              webview.open_devtools();
+              f(Webview {
+                webview: webview.inner.webview(),
+                manager: webview.inner.manager(),
+                view_controller: window.ui_view_controller() as cocoa::base::id,
+              });
             }
-            #[cfg(any(debug_assertions, feature = "devtools"))]
-            WebviewMessage::CloseDevTools => {
-              webview.close_devtools();
+            #[cfg(windows)]
+            {
+              f(Webview {
+                controller: webview.controller(),
+              });
             }
-            #[cfg(any(debug_assertions, feature = "devtools"))]
-            WebviewMessage::IsDevToolsOpen(tx) => {
-              tx.send(webview.is_devtools_open()).unwrap();
+            #[cfg(target_os = "android")]
+            {
+              f(webview.handle())
             }
           }
+
+          #[cfg(any(debug_assertions, feature = "devtools"))]
+          WebviewMessage::OpenDevTools => {
+            webview.open_devtools();
+          }
+          #[cfg(any(debug_assertions, feature = "devtools"))]
+          WebviewMessage::CloseDevTools => {
+            webview.close_devtools();
+          }
+          #[cfg(any(debug_assertions, feature = "devtools"))]
+          WebviewMessage::IsDevToolsOpen(tx) => {
+            tx.send(webview.is_devtools_open()).unwrap();
+          }
         }
       }
     }