Northern_Lights/app
1
0
Fork 0
mirror of https://github.com/StarCitizenToolBox/app.git synced 2026-01-17 05:30:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat: web nav update

Browse Source
This commit is contained in:
xkeyC 2025-12-05 10:28:12 +08:00
parent 79e1256759
commit dcb288597f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,10 @@ use crate::api::webview_api::{
}; };
// Embed the app icon at compile time // Embed the app icon at compile time
static APP_ICON_DATA: &[u8] = include_bytes!("../../windows/runner/resources/app_icon.ico"); static APP_ICON_DATA: &[u8] = include_bytes!("../../../windows/runner/resources/app_icon.ico");
// Embed the init script at compile time // Embed the init script at compile time
static INIT_SCRIPT: &str = include_str!("../assets/webview_init_script.js"); static INIT_SCRIPT: &str = include_str!("webview_init_script.js");
// ============ Types ============ // ============ Types ============
@ -284,19 +284,36 @@ fn run_webview_loop(
let event_tx = event_tx.clone(); let event_tx = event_tx.clone();
let state = Arc::clone(&state); let state = Arc::clone(&state);
let nav_history = Arc::clone(&nav_history); let nav_history = Arc::clone(&nav_history);
let proxy = proxy.clone();
move |uri| { move |uri| {
if uri == "about:blank" { if uri == "about:blank" {
return true; return true;
} }
let can_back;
let can_forward;
{ {
let mut state_guard = state.write(); let mut state_guard = state.write();
state_guard.url = uri.clone(); state_guard.url = uri.clone();
state_guard.is_loading = true; state_guard.is_loading = true;
let history = nav_history.read(); let history = nav_history.read();
state_guard.can_go_back = history.can_go_back(); can_back = history.can_go_back();
state_guard.can_go_forward = history.can_go_forward(); can_forward = history.can_go_forward();
state_guard.can_go_back = can_back;
state_guard.can_go_forward = can_forward;
} }
// Send loading state to JS immediately when navigation starts
// This makes the spinner appear on the current page before navigating away
let state_json = serde_json::json!({
"can_go_back": can_back,
"can_go_forward": can_forward,
"is_loading": true,
"url": uri
});
let script = format!("window._sctUpdateNavState && window._sctUpdateNavState({})", state_json);
let _ = proxy.send_event(UserEvent::Command(WebViewCommand::ExecuteScript(script)));
let _ = event_tx.send(WebViewEvent::NavigationStarted { url: uri }); let _ = event_tx.send(WebViewEvent::NavigationStarted { url: uri });
true true
} }

0
rust/src/assets/webview_init_script.js → rust/src/webview/webview_init_script.js
View File