fix(pet): hide the pet window instead of destroying it
The desktop-floating pet never appeared. The log established that open_pet_window ran, took the rebuild branch, and then produced neither the success log nor the failure log — so it returned Err somewhere in the config lookup, from_config, or build(), all three of which used a bare `?` with no log of their own. Two changes. close_pet_window now hides the window rather than destroying it, so every later open takes the branch that demonstrably works instead of the rebuild branch; hiding also keeps the pet's listeners and animation state, which the mode switch wants back immediately anyway. And open_pet_window is wrapped so any failure on any path is logged with the error, rather than only the reveal step. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
这个提交存在于:
父节点
6e7d51841d
当前提交
4f73c0819d
共有 1 个文件被更改,包括 21 次插入 和 18 次删除
|
|
@ -304,19 +304,23 @@ fn open_main_window(app: AppHandle) -> Result<(), String> {
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn open_pet_window(app: AppHandle) -> Result<(), String> {
|
fn open_pet_window(app: AppHandle) -> Result<(), String> {
|
||||||
|
// Wrapped so every failure path is reported. The rebuild path used to fail
|
||||||
|
// silently: the entry log said the command ran, no success log followed, and
|
||||||
|
// the three `?` returns before the reveal had no log of their own.
|
||||||
|
open_pet_window_inner(&app).inspect_err(|error| {
|
||||||
|
tracing::info!(target: "astrbot::pet", %error, "open_pet_window failed");
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn open_pet_window_inner(app: &AppHandle) -> Result<(), String> {
|
||||||
let existing = app.get_webview_window(PET_WINDOW_ID);
|
let existing = app.get_webview_window(PET_WINDOW_ID);
|
||||||
// Logged on entry so that "no log line at all" means the command was never
|
|
||||||
// invoked, rather than leaving that indistinguishable from a failure before
|
|
||||||
// the first log statement.
|
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
target: "astrbot::pet",
|
target: "astrbot::pet",
|
||||||
window_existed = existing.is_some(),
|
window_existed = existing.is_some(),
|
||||||
"open_pet_window invoked"
|
"open_pet_window invoked"
|
||||||
);
|
);
|
||||||
if let Some(window) = existing {
|
if let Some(window) = existing {
|
||||||
return reveal_pet_window(&app, &window).inspect_err(|error| {
|
return reveal_pet_window(app, &window);
|
||||||
tracing::info!(target: "astrbot::pet", %error, "revealing the existing pet window failed");
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
let config = app
|
let config = app
|
||||||
.config()
|
.config()
|
||||||
|
|
@ -325,18 +329,13 @@ fn open_pet_window(app: AppHandle) -> Result<(), String> {
|
||||||
.iter()
|
.iter()
|
||||||
.find(|window| window.label == PET_WINDOW_ID)
|
.find(|window| window.label == PET_WINDOW_ID)
|
||||||
.ok_or_else(|| "pet window config is unavailable".to_owned())?;
|
.ok_or_else(|| "pet window config is unavailable".to_owned())?;
|
||||||
let window = WebviewWindowBuilder::from_config(&app, config)
|
let window = WebviewWindowBuilder::from_config(app, config)
|
||||||
.map_err(|error| error.to_string())?
|
.map_err(|error| format!("pet window builder: {error}"))?
|
||||||
.build()
|
.build()
|
||||||
.map_err(|error| error.to_string())?;
|
.map_err(|error| format!("pet window build: {error}"))?;
|
||||||
// The rebuild path used to stop here. `close_pet_window` destroys the
|
// The rebuild path used to stop here: the config declares `visible: false`,
|
||||||
// window rather than hiding it, and the app closes it on startup whenever
|
// so the window was built and never shown.
|
||||||
// the pet is set to render inside the UI, so switching to the floating pet
|
reveal_pet_window(app, &window)
|
||||||
// always took this path — and the config declares `visible: false`, so the
|
|
||||||
// window was built and never shown. It simply did not appear.
|
|
||||||
reveal_pet_window(&app, &window).inspect_err(|error| {
|
|
||||||
tracing::info!(target: "astrbot::pet", %error, "revealing the rebuilt pet window failed");
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Places the pet window on a monitor and shows it.
|
/// Places the pet window on a monitor and shows it.
|
||||||
|
|
@ -446,8 +445,12 @@ fn close_pet_window(app: AppHandle) -> Result<(), String> {
|
||||||
window_existed = existing.is_some(),
|
window_existed = existing.is_some(),
|
||||||
"close_pet_window invoked"
|
"close_pet_window invoked"
|
||||||
);
|
);
|
||||||
|
// Hidden, not destroyed. Destroying forced every later open through the
|
||||||
|
// rebuild path, which is the path that fails — and rebuilding also throws
|
||||||
|
// away the pet's listeners and animation state for no gain, since the same
|
||||||
|
// window is wanted again as soon as the mode is switched back.
|
||||||
if let Some(window) = existing {
|
if let Some(window) = existing {
|
||||||
window.destroy().map_err(|error| error.to_string())?;
|
window.hide().map_err(|error| error.to_string())?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用