Skip to content

Commit a48c6b1

Browse files
committed
add nspanel
1 parent 552c32a commit a48c6b1

File tree

7 files changed

+91
-14
lines changed

7 files changed

+91
-14
lines changed

Cargo.lock

Lines changed: 68 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ hypr-listener-interface = { path = "plugins/listener-interface", package = "list
6464

6565
tauri = "2"
6666
tauri-build = "2"
67+
tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
6768
tauri-plugin = "2"
6869
tauri-plugin-deep-link = "2"
6970
tauri-plugin-dialog = "2"

apps/desktop/src-tauri/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ tauri-build = { workspace = true }
1919

2020
[target.'cfg(target_os = "macos")'.dependencies]
2121
tauri-plugin-apple-calendar = { workspace = true }
22+
tauri-nspanel = { workspace = true }
2223

2324
[dependencies]
2425
hypr-data = { workspace = true, optional = true }

apps/desktop/src-tauri/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ pub async fn main() {
5858
}));
5959
}
6060

61+
#[cfg(target_os = "macos")]
62+
{
63+
builder = builder.plugin(tauri_nspanel::init());
64+
}
65+
6166
builder = builder
6267
.plugin(tauri_plugin_listener::init())
6368
.plugin(tauri_plugin_sse::init())

apps/desktop/src/routes/app.note.$id.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,7 @@ function OnboardingSupport({ session }: { session: Session }) {
142142
}
143143

144144
if (ongoingSessionStatus === "running_active") {
145-
windowsCommands.windowShow({ type: "video", value: video }).then(() => {
146-
windowsCommands.windowResizeDefault({ type: "video", value: video });
147-
windowsCommands.windowResizeDefault({ type: "main" });
148-
});
145+
windowsCommands.windowShow({ type: "video", value: video });
149146
}
150147
}, [onboardingSessionId, session.id, isEnhancePending, ongoingSessionStatus]);
151148

plugins/listener/Cargo.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,38 @@ specta-typescript = { workspace = true }
1919
uuid = { workspace = true }
2020

2121
[dependencies]
22-
hypr-listener-interface = { workspace = true }
23-
tauri-plugin-auth = { workspace = true }
24-
tauri-plugin-connector = { workspace = true }
25-
tauri-plugin-db = { workspace = true }
26-
tauri-plugin-tray = { workspace = true }
27-
2822
hypr-audio = { workspace = true }
2923
hypr-audio-utils = { workspace = true }
3024
hypr-data = { workspace = true }
3125
hypr-db-core = { workspace = true }
3226
hypr-db-user = { workspace = true }
3327
hypr-language = { workspace = true }
28+
hypr-listener-interface = { workspace = true }
3429
hypr-ws = { workspace = true }
3530

31+
tauri-plugin-auth = { workspace = true }
32+
tauri-plugin-connector = { workspace = true }
33+
tauri-plugin-db = { workspace = true }
34+
tauri-plugin-tray = { workspace = true }
35+
tauri-plugin-windows = { workspace = true }
36+
3637
tauri = { workspace = true, features = ["specta", "test"] }
37-
tracing = { workspace = true }
38+
39+
specta = { workspace = true }
40+
tauri-specta = { workspace = true, features = ["derive", "typescript"] }
3841

3942
bytes = { workspace = true }
4043
chrono = { workspace = true }
4144
codes-iso-639 = { workspace = true }
4245
serde = { workspace = true }
4346
serde_json = { workspace = true }
44-
specta = { workspace = true }
4547
strum = { workspace = true, features = ["derive"] }
46-
tauri-specta = { workspace = true, features = ["derive", "typescript"] }
4748
thiserror = { workspace = true }
4849
url = { workspace = true }
4950

5051
futures-util = { workspace = true }
5152
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
53+
tracing = { workspace = true }
5254

5355
hound = { workspace = true }
5456
statig = { workspace = true, features = ["async"] }

plugins/windows/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ tauri-plugin = { workspace = true, features = ["build"] }
1313
[dev-dependencies]
1414
specta-typescript = { workspace = true }
1515

16+
[target.'cfg(target_os = "macos")'.dependencies]
17+
tauri-nspanel = { workspace = true }
18+
1619
[dependencies]
1720
serde = { workspace = true }
1821
specta = { workspace = true }
1922
strum = { workspace = true, features = ["derive"] }
2023

21-
tauri = { workspace = true, features = ["test"] }
24+
tauri = { workspace = true, features = ["test", "macos-private-api"] }
2225
tauri-specta = { workspace = true, features = ["derive", "typescript"] }
2326

2427
tauri-plugin-analytics = { workspace = true }

0 commit comments

Comments
 (0)