|
@@ -24,6 +24,7 @@ use tauri_runtime::{
|
|
#[cfg(target_os = "macos")]
|
|
#[cfg(target_os = "macos")]
|
|
use tauri_utils::TitleBarStyle;
|
|
use tauri_utils::TitleBarStyle;
|
|
use tauri_utils::{config::WindowConfig, Theme};
|
|
use tauri_utils::{config::WindowConfig, Theme};
|
|
|
|
+use url::Url;
|
|
use uuid::Uuid;
|
|
use uuid::Uuid;
|
|
|
|
|
|
#[cfg(windows)]
|
|
#[cfg(windows)]
|
|
@@ -116,7 +117,7 @@ impl<T: UserEvent> RuntimeHandle<T> for MockRuntimeHandle {
|
|
id,
|
|
id,
|
|
context: self.context.clone(),
|
|
context: self.context.clone(),
|
|
last_evaluated_script: Default::default(),
|
|
last_evaluated_script: Default::default(),
|
|
- url: pending.url,
|
|
|
|
|
|
+ url: Arc::new(Mutex::new(pending.url)),
|
|
},
|
|
},
|
|
menu_ids: Default::default(),
|
|
menu_ids: Default::default(),
|
|
})
|
|
})
|
|
@@ -190,7 +191,7 @@ impl<T: UserEvent> RuntimeHandle<T> for MockRuntimeHandle {
|
|
pub struct MockDispatcher {
|
|
pub struct MockDispatcher {
|
|
id: WindowId,
|
|
id: WindowId,
|
|
context: RuntimeContext,
|
|
context: RuntimeContext,
|
|
- url: String,
|
|
|
|
|
|
+ url: Arc<Mutex<String>>,
|
|
last_evaluated_script: Arc<Mutex<Option<String>>>,
|
|
last_evaluated_script: Arc<Mutex<Option<String>>>,
|
|
}
|
|
}
|
|
|
|
|
|
@@ -383,7 +384,12 @@ impl<T: UserEvent> Dispatch<T> for MockDispatcher {
|
|
}
|
|
}
|
|
|
|
|
|
fn url(&self) -> Result<url::Url> {
|
|
fn url(&self) -> Result<url::Url> {
|
|
- self.url.parse().map_err(|_| Error::FailedToReceiveMessage)
|
|
|
|
|
|
+ self
|
|
|
|
+ .url
|
|
|
|
+ .lock()
|
|
|
|
+ .unwrap()
|
|
|
|
+ .parse()
|
|
|
|
+ .map_err(|_| Error::FailedToReceiveMessage)
|
|
}
|
|
}
|
|
|
|
|
|
fn scale_factor(&self) -> Result<f64> {
|
|
fn scale_factor(&self) -> Result<f64> {
|
|
@@ -528,7 +534,7 @@ impl<T: UserEvent> Dispatch<T> for MockDispatcher {
|
|
id,
|
|
id,
|
|
context: self.context.clone(),
|
|
context: self.context.clone(),
|
|
last_evaluated_script: Default::default(),
|
|
last_evaluated_script: Default::default(),
|
|
- url: pending.url,
|
|
|
|
|
|
+ url: Arc::new(Mutex::new(pending.url)),
|
|
},
|
|
},
|
|
menu_ids: Default::default(),
|
|
menu_ids: Default::default(),
|
|
})
|
|
})
|
|
@@ -554,6 +560,11 @@ impl<T: UserEvent> Dispatch<T> for MockDispatcher {
|
|
Ok(())
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ fn navigate(&self, url: Url) -> Result<()> {
|
|
|
|
+ *self.url.lock().unwrap() = url.to_string();
|
|
|
|
+ Ok(())
|
|
|
|
+ }
|
|
|
|
+
|
|
fn maximize(&self) -> Result<()> {
|
|
fn maximize(&self) -> Result<()> {
|
|
Ok(())
|
|
Ok(())
|
|
}
|
|
}
|
|
@@ -788,7 +799,7 @@ impl<T: UserEvent> Runtime<T> for MockRuntime {
|
|
id,
|
|
id,
|
|
context: self.context.clone(),
|
|
context: self.context.clone(),
|
|
last_evaluated_script: Default::default(),
|
|
last_evaluated_script: Default::default(),
|
|
- url: pending.url,
|
|
|
|
|
|
+ url: Arc::new(Mutex::new(pending.url)),
|
|
},
|
|
},
|
|
menu_ids: Default::default(),
|
|
menu_ids: Default::default(),
|
|
})
|
|
})
|