Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ tauri = { version = "2.12.1", default-features = false, features = [
tauri-plugin-opener = "2"
# 浏览器里授权完成之后,那一页把应用带回前台(`thinkwatch://`)
tauri-plugin-deep-link = "2"
# 呼出快捷键(设置 → 通用,见 `hotkey.rs`):macOS 的 RegisterEventHotKey、Windows 的
# RegisterHotKey、X11 的 XGrabKey
tauri-plugin-global-shortcut = "2"

# 控制面契约来自 core,版本钉在下面的 `[workspace.dependencies]` 里。
tw-api = { workspace = true, features = ["ts"] }
Expand Down
13 changes: 13 additions & 0 deletions src-tauri/src/client_prefs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,19 @@ mod tests {
assert_eq!(got.zoom, crate::zoom::Zoom::default());
}

/// 呼出快捷键也是这台电脑自己的:不交上去,别处交下来的也不盖
#[test]
fn the_hotkey_stays_on_this_computer() {
let p = Prefs {
hotkey: crate::hotkey::Setting(None),
..Prefs::default()
};
assert!(!general(&p).contains_key("hotkey"));
assert!(same(&Prefs::default(), &p));
let got = overlay(&Prefs::default(), &serde_json::json!({ "hotkey": "" }));
assert_eq!(got.hotkey, crate::hotkey::Setting::default());
}

#[test]
fn sameness_only_looks_at_the_shared_settings() {
let a = Prefs::default();
Expand Down
Loading
Loading