You've already forked AstralRinth
forked from didirus/AstralRinth
refactor(app): reduce tech debt by eliminating wry fork (#4500)
This commit is contained in:
committed by
GitHub
parent
7e682c22bb
commit
dbc64afe48
@@ -79,7 +79,6 @@ pub async fn init_ads_window<R: Runtime>(
|
||||
override_shown: bool,
|
||||
) -> crate::api::Result<()> {
|
||||
use tauri::WebviewUrl;
|
||||
const LINK_SCRIPT: &str = include_str!("ads-init.js");
|
||||
|
||||
let state = app.state::<RwLock<AdsState>>();
|
||||
let mut state = state.write().await;
|
||||
@@ -102,25 +101,42 @@ pub async fn init_ads_window<R: Runtime>(
|
||||
webview.set_position(PhysicalPosition::new(-1000, -1000));
|
||||
}
|
||||
} else if let Some(window) = app.get_window("main") {
|
||||
let _ = window.add_child(
|
||||
let webview = window.add_child(
|
||||
tauri::webview::WebviewBuilder::new(
|
||||
"ads-window",
|
||||
WebviewUrl::External(
|
||||
AD_LINK.parse().unwrap(),
|
||||
),
|
||||
)
|
||||
.initialization_script(LINK_SCRIPT)
|
||||
// .initialization_script_for_main_only(LINK_SCRIPT, false)
|
||||
.user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
|
||||
.zoom_hotkeys_enabled(false)
|
||||
.transparent(true),
|
||||
.initialization_script_for_all_frames(include_str!("ads-init.js"))
|
||||
.user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
|
||||
.zoom_hotkeys_enabled(false)
|
||||
.transparent(true)
|
||||
.on_new_window(|_, _| tauri::webview::NewWindowResponse::Deny),
|
||||
if state.shown {
|
||||
position
|
||||
} else {
|
||||
PhysicalPosition::new(-1000.0, -1000.0)
|
||||
},
|
||||
size,
|
||||
);
|
||||
)?;
|
||||
|
||||
webview.with_webview(#[allow(unused_variables)] |webview2| {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
use webview2_com::Microsoft::Web::WebView2::Win32::ICoreWebView2_8;
|
||||
use windows_core::Interface;
|
||||
|
||||
let webview2_controller = webview2.controller();
|
||||
let Ok(webview2_8) = unsafe { webview2_controller.CoreWebView2() }
|
||||
.and_then(|core_webview2| core_webview2.cast::<ICoreWebView2_8>())
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
unsafe { webview2_8.SetIsMuted(true) }.ok();
|
||||
}
|
||||
})?;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user