This commit is contained in:
zhongluofeng committed 2026-10-10 14:29:48 +08:00
1 parent ad987111a3
commit c9e61f38c5
89 files changed
+11775 -3155

No files matched your search

+86 -6
View File
@@ -27,6 +27,7 @@ static LAST_MENU_LAYOUT: Mutex<Option<(f64, f64, f64, f64, f64)>> = Mutex::new(N
use crate::win32_util::{get_work_area, get_monitor_bounds_at_point, get_dpi_for_point};
use crate::mihomo_manager::{MihomoManager, is_pseudo_node};
use crate::monitor_kernel::MonitorKernel;
use crate::music::{AudioEngine, SmtcMetaCache, SMTC_BUTTON_EVENT};
use crate::process_manager::{ProcessManager, ProcessStatus};
/// 托盘菜单窗口标签
@@ -53,6 +54,34 @@ pub struct TrayMenuState {
pub proxy_current: Option<String>,
}
/// 托盘音乐控制条状态。
///
/// 曲目信息取自 [`SmtcMetaCache`](前端推给 SMTC 的元数据回填),
/// 播放态取自 [`AudioEngine`]:两者都在 Rust 侧,托盘菜单只需一次拉取。
#[derive(Serialize, Clone, Debug)]
#[serde(rename_all = "camelCase")]
pub struct MusicState {
pub playing: bool,
pub title: String,
pub artist: String,
}
fn get_music_state(app: &AppHandle) -> MusicState {
let playing = app
.try_state::<AudioEngine>()
.map(|e| e.state().playing)
.unwrap_or(false);
let (title, artist) = app
.try_state::<SmtcMetaCache>()
.and_then(|c| c.0.lock().ok().map(|g| (g.title.clone(), g.artist.clone())))
.unwrap_or_default();
MusicState {
playing,
title,
artist,
}
}
// ===== 状态查询 =====
fn is_proxy_running(app: &AppHandle) -> bool {
@@ -420,14 +449,18 @@ pub async fn tray_menu_action(
send_notification(&app, "Kernel 重启失败", &e);
}
}
"download_new" => {
focus_main_window(&app);
let _ = app.emit(crate::constants::events::TRAY_NEW_DOWNLOAD, ());
"terminal" => {
// 新建终端选择窗口由前端创建(label 需命中 terminal-window-* 授权)
let _ = app.emit(crate::constants::events::TRAY_OPEN_TERMINAL, ());
hide_tray_menu(&app);
}
"settings" => {
focus_main_window(&app);
let _ = app.emit(crate::constants::events::TRAY_OPEN_SETTINGS, ());
"dsh" => {
// 未启动时前端会先开进度窗口并同步拉起服务
let _ = app.emit(crate::constants::events::TRAY_OPEN_DSH, ());
hide_tray_menu(&app);
}
"editor" => {
let _ = app.emit(crate::constants::events::TRAY_OPEN_EDITOR, ());
hide_tray_menu(&app);
}
"quit" => {
@@ -463,6 +496,37 @@ pub async fn tray_menu_hide(app: AppHandle) -> Result<(), String> {
Ok(())
}
/// 读取音乐控制条状态(托盘菜单显示时 / 可见期间轮询)。
#[tauri::command]
pub fn tray_music_state(app: AppHandle) -> MusicState {
get_music_state(&app)
}
/// 托盘音乐控制条动作。
///
/// 动作统一经 [`SMTC_BUTTON_EVENT`] 转给主窗口前端(`feiniuStore`)执行——
/// 队列、洗牌、单曲循环等播放语义都在前端,托盘只负责转发,不重复实现。
/// `action`:`toggle` | `play` | `pause` | `next` | `prev`。
#[tauri::command]
pub fn tray_music_control(app: AppHandle, action: String) -> Result<(), String> {
let name = match action.as_str() {
"play" => "play",
"pause" => "pause",
// 无当前会话时按下「播放/暂停」应重新起播,故按引擎真实态决定
"toggle" => {
if get_music_state(&app).playing {
"pause"
} else {
"play"
}
}
"next" => "next",
"prev" => "prev",
other => return Err(format!("未知的音乐控制动作: {other}")),
};
app.emit(SMTC_BUTTON_EVENT, name).map_err(|e| e.to_string())
}
/// 前端测量内容高度后调用:调整窗口大小、精确定位、然后显示。
/// 这样窗口从一开始就是正确尺寸和位置,不会出现间隙。
#[tauri::command]
@@ -502,6 +566,22 @@ pub async fn tray_menu_ready(content_height: f64, app: AppHandle) -> Result<(),
let mut t = LAST_SHOW_TIME.lock().unwrap_or_else(|e| e.into_inner());
*t = Some(Instant::now());
}
// 位置与尺寸先交给一次原生 SetWindowPos 落位:窗口隐藏时,上面的 set_size/set_position
// 不保证在紧随其后的 show 之前生效,首次弹出会沿用预创建时的旧高度——表现为
// 「第一次高度不对、收起后再开正常」。原生调用同步返回,窗口已处于目标位置与尺寸。
// 显示仍走 Tauri 的 show():它才会做 tao 的可见性/激活/Z 序处理(直接 SWP_SHOWWINDOW
// 会让菜单掉到任务栏后面,且窗口拿不到焦点,失焦自动关闭随之失效)。
#[cfg(windows)]
if let Ok(hwnd) = win.hwnd() {
crate::win32_util::set_bounds(
hwnd.0 as isize,
x as i32,
y as i32,
win_w_px as i32,
win_h_px as i32,
);
}
let _ = win.show();
let _ = win.set_focus();