feat(positioner, window-state): impl WindowExt for WebviewWindow (#…

…1283) closes #1281
tauri-apps · May 3, 2024 · d9de5b1 · d9de5b1
1 parent b4efa58
commit d9de5b1
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 35 deletions.
diff --git a/.changes/impl-ext-for-webview-windows.md b/.changes/impl-ext-for-webview-windows.md
@@ -0,0 +1,6 @@
+---
+"positioner": "patch"
+"window-state": "patch"
+---
+
+Implement `WindowExt` for `WebviewWindow`.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/plugins/positioner/src/ext.rs b/plugins/positioner/src/ext.rs
@@ -8,7 +8,7 @@ use crate::Tray;
 use serde_repr::Deserialize_repr;
 #[cfg(feature = "tray-icon")]
 use tauri::Manager;
-use tauri::{PhysicalPosition, PhysicalSize, Result, Runtime, Window};
+use tauri::{PhysicalPosition, PhysicalSize, Result, Runtime, WebviewWindow, Window};
 
 /// Well known window positions.
 #[derive(Debug, Deserialize_repr)]
@@ -45,6 +45,11 @@ pub trait WindowExt {
     fn move_window(&self, position: Position) -> Result<()>;
 }
 
+impl<R: Runtime> WindowExt for WebviewWindow<R> {
+    fn move_window(&self, pos: Position) -> Result<()> {
+        self.as_ref().window().move_window(pos)
+    }
+}
 impl<R: Runtime> WindowExt for Window<R> {
     fn move_window(&self, pos: Position) -> Result<()> {
         use Position::*;

diff --git a/plugins/window-state/src/cmd.rs b/plugins/window-state/src/cmd.rs
@@ -26,8 +26,6 @@ pub async fn restore_state<R: Runtime>(
         .ok_or_else(|| format!("Invalid state flags bits: {}", flags))?;
     app.get_webview_window(&label)
         .ok_or_else(|| format!("Couldn't find window with label: {}", label))?
-        .as_ref()
-        .window()
         .restore_state(flags)
         .map_err(|e| e.to_string())?;
     Ok(())

diff --git a/plugins/window-state/src/lib.rs b/plugins/window-state/src/lib.rs
@@ -16,8 +16,8 @@ use bitflags::bitflags;
 use serde::{Deserialize, Serialize};
 use tauri::{
     plugin::{Builder as PluginBuilder, TauriPlugin},
-    LogicalSize, Manager, Monitor, PhysicalPosition, PhysicalSize, RunEvent, Runtime, Window,
-    WindowEvent,
+    LogicalSize, Manager, Monitor, PhysicalPosition, PhysicalSize, RunEvent, Runtime,
+    WebviewWindow, Window, WindowEvent,
 };
 
 use std::{
@@ -118,7 +118,7 @@ impl<R: Runtime> AppHandleExt for tauri::AppHandle<R> {
             let mut state = cache.0.lock().unwrap();
             for (label, s) in state.iter_mut() {
                 if let Some(window) = self.get_webview_window(label) {
-                    window.as_ref().window().update_state(s, flags)?;
+                    window.update_state(s, flags)?;
                 }
             }
 
@@ -141,6 +141,11 @@ pub trait WindowExt {
     fn restore_state(&self, flags: StateFlags) -> tauri::Result<()>;
 }
 
+impl<R: Runtime> WindowExt for WebviewWindow<R> {
+    fn restore_state(&self, flags: StateFlags) -> tauri::Result<()> {
+        self.as_ref().window().restore_state(flags)
+    }
+}
 impl<R: Runtime> WindowExt for Window<R> {
     fn restore_state(&self, flags: StateFlags) -> tauri::Result<()> {
         let cache = self.state::<WindowStateCache>();
@@ -246,6 +251,12 @@ trait WindowExtInternal {
     fn update_state(&self, state: &mut WindowState, flags: StateFlags) -> tauri::Result<()>;
 }
 
+impl<R: Runtime> WindowExtInternal for WebviewWindow<R> {
+    fn update_state(&self, state: &mut WindowState, flags: StateFlags) -> tauri::Result<()> {
+        self.as_ref().window().update_state(state, flags)
+    }
+}
+
 impl<R: Runtime> WindowExtInternal for Window<R> {
     fn update_state(&self, state: &mut WindowState, flags: StateFlags) -> tauri::Result<()> {
         let is_maximized = match flags.intersects(StateFlags::MAXIMIZED | StateFlags::SIZE) {