Northern_Lights/app
1
0
Fork 0
mirror of https://github.com/StarCitizenToolBox/app.git synced 2026-01-15 12:40:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: webview

Browse Source
This commit is contained in:
xkeyC 2025-12-13 16:14:12 +08:00
parent 39d571960b
commit c8962d509c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ui/home/dialogs/home_game_login_dialog_ui_model.dart
View File

@ -166,6 +166,7 @@ class HomeGameLoginUIModel extends _$HomeGameLoginUIModel {
applicationSupportDir: appGlobalState.applicationSupportDir!, applicationSupportDir: appGlobalState.applicationSupportDir!,
appVersionData: appGlobalState.networkVersionData!, appVersionData: appGlobalState.networkVersionData!,
); );
await Future.delayed(Duration(milliseconds: 500));
await webViewModel.launch(url, appGlobalState.networkVersionData!); await webViewModel.launch(url, appGlobalState.networkVersionData!);
} }

17
rust/src/webview/webview_impl.rs
View File

@ -434,6 +434,16 @@ fn run_webview_loop(
let proxy = proxy.clone(); let proxy = proxy.clone();
move |event, url| { move |event, url| {
if url == "about:blank" { if url == "about:blank" {
if matches!(event, PageLoadEvent::Finished) {
// if url is about:blank, show loading
let loading_script = format!(
r#"document.open(); document.write({}); document.close();"#,
serde_json::to_string(LOADING_PAGE_HTML).unwrap_or_default()
);
let _ = proxy.send_event(UserEvent::Command(
WebViewCommand::ExecuteScript(loading_script),
));
}
return; return;
} }
@ -603,13 +613,6 @@ fn run_webview_loop(
.build(&window) .build(&window)
.expect("Failed to create webview"); .expect("Failed to create webview");
// Show loading page while waiting for Navigate command
let loading_script = format!(
r#"document.open(); document.write({}); document.close();"#,
serde_json::to_string(LOADING_PAGE_HTML).unwrap_or_default()
);
let _ = webview.evaluate_script(&loading_script);
let webview = Arc::new(webview); let webview = Arc::new(webview);
let webview_cmd = Arc::clone(&webview); let webview_cmd = Arc::clone(&webview);