编辑调整、对比模块
This commit is contained in:
1 parent
c9e61f38c5
commit
6cfa74c901
76 files changed
+9514
-626
No files matched your search
@@ -64,6 +64,21 @@ pub struct MusicState {
|
||||
pub playing: bool,
|
||||
pub title: String,
|
||||
pub artist: String,
|
||||
/// 当前音量(0.0~1.0)
|
||||
pub volume: f32,
|
||||
pub muted: bool,
|
||||
}
|
||||
|
||||
/// 托盘调音量 / 静音后广播给主窗口前端的权威值(前端据此更新 ref 并落盘)。
|
||||
///
|
||||
/// 为什么不走 [`SMTC_BUTTON_EVENT`]:那条通道是「无负载字符串动作」,音量要带数值。
|
||||
pub const TRAY_MUSIC_VOLUME_EVENT: &str = "tray-music-volume";
|
||||
|
||||
#[derive(Serialize, Clone, Debug)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct TrayVolumeState {
|
||||
pub volume: f32,
|
||||
pub muted: bool,
|
||||
}
|
||||
|
||||
fn get_music_state(app: &AppHandle) -> MusicState {
|
||||
@@ -71,6 +86,11 @@ fn get_music_state(app: &AppHandle) -> MusicState {
|
||||
.try_state::<AudioEngine>()
|
||||
.map(|e| e.state().playing)
|
||||
.unwrap_or(false);
|
||||
// 音量/静音取自引擎:托盘拖动滑块直接改的就是它,这里读到的是真实生效值
|
||||
let (volume, muted) = app
|
||||
.try_state::<AudioEngine>()
|
||||
.map(|e| e.volume())
|
||||
.unwrap_or((1.0, false));
|
||||
let (title, artist) = app
|
||||
.try_state::<SmtcMetaCache>()
|
||||
.and_then(|c| c.0.lock().ok().map(|g| (g.title.clone(), g.artist.clone())))
|
||||
@@ -79,6 +99,8 @@ fn get_music_state(app: &AppHandle) -> MusicState {
|
||||
playing,
|
||||
title,
|
||||
artist,
|
||||
volume,
|
||||
muted,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -504,11 +526,35 @@ pub fn tray_music_state(app: AppHandle) -> MusicState {
|
||||
|
||||
/// 托盘音乐控制条动作。
|
||||
///
|
||||
/// 动作统一经 [`SMTC_BUTTON_EVENT`] 转给主窗口前端(`feiniuStore`)执行——
|
||||
/// 队列、洗牌、单曲循环等播放语义都在前端,托盘只负责转发,不重复实现。
|
||||
/// `action`:`toggle` | `play` | `pause` | `next` | `prev`。
|
||||
/// 播放语义(队列、洗牌、单曲循环等)都在前端,托盘只负责转发:
|
||||
/// - 播放/暂停/上下首/切换播放顺序 → [`SMTC_BUTTON_EVENT`] 转给主窗口前端(`feiniuStore`)执行;
|
||||
/// - 音量与静音**直接改 Rust 侧引擎**(拖动滑块要即时出声,不能等一轮事件往返),
|
||||
/// 改完把权威值经 [`TRAY_MUSIC_VOLUME_EVENT`] 广播给前端,由它更新 ref 并落盘。
|
||||
///
|
||||
/// `action`:`toggle` | `play` | `pause` | `next` | `prev` | `toggle-mode` | `volume` | `toggle-mute`。
|
||||
/// `level`:仅 `volume` 需要(0.0~1.0)。
|
||||
#[tauri::command]
|
||||
pub fn tray_music_control(app: AppHandle, action: String) -> Result<(), String> {
|
||||
pub fn tray_music_control(
|
||||
app: AppHandle,
|
||||
action: String,
|
||||
level: Option<f32>,
|
||||
) -> Result<(), String> {
|
||||
if action == "volume" || action == "toggle-mute" {
|
||||
let engine = app.try_state::<AudioEngine>().ok_or("播放引擎未初始化")?;
|
||||
let (cur, muted) = engine.volume();
|
||||
if action == "volume" {
|
||||
let v = level.ok_or("volume 动作缺少 level")?.clamp(0.0, 1.0);
|
||||
// 调到非零即解除静音(与手机遥控的音量语义一致)
|
||||
engine.set_volume(v, if v > 0.0 { false } else { muted });
|
||||
} else {
|
||||
engine.set_volume(cur, !muted);
|
||||
}
|
||||
let (volume, muted) = engine.volume();
|
||||
return app
|
||||
.emit(TRAY_MUSIC_VOLUME_EVENT, TrayVolumeState { volume, muted })
|
||||
.map_err(|e| e.to_string());
|
||||
}
|
||||
|
||||
let name = match action.as_str() {
|
||||
"play" => "play",
|
||||
"pause" => "pause",
|
||||
@@ -522,6 +568,8 @@ pub fn tray_music_control(app: AppHandle, action: String) -> Result<(), String>
|
||||
}
|
||||
"next" => "next",
|
||||
"prev" => "prev",
|
||||
// 播放顺序(列表循环 / 单曲循环 / 随机)由前端维护,这里只转发
|
||||
"toggle-mode" => "toggle-mode",
|
||||
other => return Err(format!("未知的音乐控制动作: {other}")),
|
||||
};
|
||||
app.emit(SMTC_BUTTON_EVENT, name).map_err(|e| e.to_string())
|
||||
@@ -539,8 +587,11 @@ pub async fn tray_menu_ready(content_height: f64, app: AppHandle) -> Result<(),
|
||||
layout.unwrap_or((0.0, 1040.0, 0.0, 1080.0, 1.0))
|
||||
};
|
||||
|
||||
// 将内容高度限制在合理范围内(前端上报为逻辑像素)
|
||||
let h = content_height.max(100.0).min(520.0);
|
||||
// 可用高度:光标所在位置到屏幕顶部的空间(菜单底部对齐光标向上展开)。
|
||||
// 不再用固定上限,内容多时窗口按内容完整撑开;仅当内容超过可用空间时才收窄
|
||||
// (此时前端 .tray-menu-scroll 退化为滚动)。
|
||||
let avail_logical = (cursor_y - scr_top).max(0.0) / scale;
|
||||
let h = content_height.max(100.0).min(avail_logical.max(100.0));
|
||||
|
||||
// 调整窗口尺寸(物理像素,与物理坐标定位保持一致,避免混合 DPI 换算偏移)
|
||||
let win_w_px = MENU_W * scale;
|
||||
|
||||
Reference in new issue
Block a user