refactor: update to wry 0.9 (#1630)

Author: lucasfernog

.changes/create-window-refactor.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+The `create_window` API callback now takes two arguments: the `WindowBuilder` and the `WebviewAttributes` and must return a tuple containing both values.

.changes/drag-window-api.md

@@ -0,0 +1,5 @@
+---
+"api": patch
+---
+
+Adds `startDragging` API on the window module.

.changes/window-attributes-rename.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Rename `Attributes` to `WindowBuilder`.

.changes/wry-update.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Update `wry` to v0.9.

core/tauri/Cargo.toml

@@ -24,7 +24,7 @@ thiserror = "1.0.24"
 once_cell = "1.7.2"
 tauri-macros = { version = "1.0.0-beta-rc.1", path = "../tauri-macros" }
 tauri-utils = { version = "1.0.0-beta-rc.1", path = "../tauri-utils" }
-wry = "0.8"
+wry = "0.9"
 rand = "0.8"
 reqwest = { version = "0.11", features = [ "json", "multipart" ] }
 tempfile = "3"
@@ -47,6 +47,7 @@ open = "1.7.0"
 shared_child = "0.3"
 os_pipe = "0.9"
 minisign-verify = "0.1.8"
+image = "0.23"
 
 [build-dependencies]
 cfg_aliases = "0.1.1"

core/tauri/scripts/core.js

@@ -187,6 +187,18 @@ if (!String.prototype.startsWith) {
     );
   }
 
+  // drag region
+  document.addEventListener('mousedown', (e) => {
+    if (e.target.classList.contains('drag-region') && e.buttons === 1) {
+      window.__TAURI__.invoke('tauri', {
+        __tauriModule: "Window",
+        message: {
+          cmd: "startDragging",
+        }
+      })
+    }
+  })
+
   window.__TAURI__.invoke('tauri', {
     __tauriModule: "Event",
     message: {

core/tauri/src/endpoints/window.rs

@@ -89,6 +89,7 @@ pub enum Cmd {
   SetIcon {
     icon: IconDto,
   },
+  StartDragging,
 }
 
 #[cfg(window_create)]
@@ -122,9 +123,11 @@ impl Cmd {
           });
 
           let url = options.url.clone();
-          let pending =
-            crate::runtime::window::PendingWindow::with_config(options, label.clone(), url);
-
+          let pending = crate::runtime::window::PendingWindow::with_config(
+            options,
+            crate::runtime::webview::WebviewAttributes::new(url),
+            label.clone(),
+          );
           window.create_window(pending)?.emit_others(
             &crate::runtime::manager::tauri_event::<P::Event>("tauri://window-created"),
             Some(WindowCreatedEvent {
@@ -160,6 +163,7 @@ impl Cmd {
         Self::SetPosition { x, y } => window.set_position(x, y)?,
         Self::SetFullscreen { fullscreen } => window.set_fullscreen(fullscreen)?,
         Self::SetIcon { icon } => window.set_icon(icon.into())?,
+        Self::StartDragging => window.start_dragging()?,
       }
       Ok(().into())
     }

core/tauri/src/lib.rs

@@ -52,7 +52,7 @@ pub use {
   hooks::{InvokeHandler, InvokeMessage, OnPageLoad, PageLoadPayload, SetupHook},
   runtime::app::{App, Builder},
   runtime::flavors::wry::Wry,
-  runtime::webview::Attributes,
+  runtime::webview::{WebviewAttributes, WindowBuilder},
   runtime::window::export::Window,
 };
 
@@ -92,6 +92,7 @@ macro_rules! tauri_build_context {
 }
 
 /// A icon definition.
+#[derive(Debug, Clone)]
 pub enum Icon {
   /// Icon from file path.
   File(PathBuf),

core/tauri/src/runtime/app.rs

@@ -10,7 +10,7 @@ use crate::{
     flavors::wry::Wry,
     manager::{Args, WindowManager},
     tag::Tag,
-    webview::{Attributes, CustomProtocol},
+    webview::{CustomProtocol, WebviewAttributes, WindowBuilder},
     window::PendingWindow,
     Dispatch, Runtime,
   },
@@ -183,12 +183,23 @@ where
   /// Creates a new webview.
   pub fn create_window<F>(mut self, label: L, url: WindowUrl, setup: F) -> Self
   where
-    F: FnOnce(<R::Dispatcher as Dispatch>::Attributes) -> <R::Dispatcher as Dispatch>::Attributes,
+    F: FnOnce(
+      <R::Dispatcher as Dispatch>::WindowBuilder,
+      WebviewAttributes,
+    ) -> (
+      <R::Dispatcher as Dispatch>::WindowBuilder,
+      WebviewAttributes,
+    ),
   {
-    let attributes = setup(<R::Dispatcher as Dispatch>::Attributes::new());
-    self
-      .pending_windows
-      .push(PendingWindow::new(attributes, label, url));
+    let (window_attributes, webview_attributes) = setup(
+      <R::Dispatcher as Dispatch>::WindowBuilder::new(),
+      WebviewAttributes::new(url),
+    );
+    self.pending_windows.push(PendingWindow::new(
+      window_attributes,
+      webview_attributes,
+      label,
+    ));
     self
   }
 
@@ -236,9 +247,11 @@ where
         .parse()
         .unwrap_or_else(|_| panic!("bad label found in config: {}", config.label));
 
-      self
-        .pending_windows
-        .push(PendingWindow::with_config(config, label, url));
+      self.pending_windows.push(PendingWindow::with_config(
+        config,
+        WebviewAttributes::new(url),
+        label,
+      ));
     }
 
     manager.initialize_plugins()?;