Skip to content

Refactors in windows.rs, Bump tauri and tauri plugin and objc2-* crate versions #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ItsEeleeya wants to merge 39 commits into
base: main
Choose a base branch
from
Open

Refactors in windows.rs, Bump tauri and tauri plugin and objc2-* crate versions #1399

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6b9c44b
bump tauri and tauri plugin versions
ItsEeleeya Nov 11, 2025
40cf146
Remove macos/delegates.rs
ItsEeleeya Nov 11, 2025
bff5b66
Merge remote-tracking branch 'upstream/main' into platform-integrations
ItsEeleeya Nov 13, 2025
a681a88
Rename CapWindowId -> CapWindowDef, ShowCapWindow -> CapWindow + Upda…
ItsEeleeya Nov 14, 2025
3df6657
Add `objc2-*` to desktop crates + use objc2_application_services in p…
ItsEeleeya Nov 14, 2025
ab4fb11
bump tauri version + cleanups in windows.rs
ItsEeleeya Nov 15, 2025
c0e5724
Use tauri window dispatch for calling AppKit on main instead of dispatch
ItsEeleeya Nov 16, 2025
3639093
macOS: Note recent documents
ItsEeleeya Nov 16, 2025
5ce30ac
CapThumbnailProvider macOS Extension crate
ItsEeleeya Nov 17, 2025
501baf1
Merge remote-tracking branch 'upstream/main' into platform-integrations
ItsEeleeya Nov 17, 2025
6164124
Merge remote-tracking branch 'upstream/main' into platform-integrations
ItsEeleeya Nov 19, 2025
cf7be04
Revert "CapThumbnailProvider macOS Extension crate"
ItsEeleeya Nov 19, 2025
3aa2905
Add more associated file info like UTTypeConformsTo and UTTypeIdentif…
ItsEeleeya Nov 19, 2025
cd6e23e
fix after branch update
ItsEeleeya Nov 20, 2025
ff91c46
Add xcode project for plugins
ItsEeleeya Nov 20, 2025
bb33158
Revert "Add xcode project for plugins"
ItsEeleeya Nov 22, 2025
9ab6aba
Merge remote-tracking branch 'upstream/main' into refactor/WindowDef
ItsEeleeya Nov 22, 2025
1099572
Remove unused + remove for now
ItsEeleeya Nov 22, 2025
3465e15
missed rename on windows specific fn
ItsEeleeya Nov 22, 2025
f80a754
Apply clippy suggestions
ItsEeleeya Nov 22, 2025
c9cd0e8
Fix main window and target_select_overlay window levels using non-sta…
ItsEeleeya Nov 22, 2025
58ddcfe
Merge remote-tracking branch 'upstream/main' into next
ItsEeleeya Nov 29, 2025
f02714b
cargo fmt
ItsEeleeya Nov 29, 2025
dc2c443
Fix after updating from main
ItsEeleeya Nov 29, 2025
1e19cae
Merge remote-tracking branch 'upstream/main' into next
ItsEeleeya Nov 29, 2025
2227fa7
Use tauri-cli ^2.9.4
ItsEeleeya Nov 29, 2025
3b48cc3
Update pnpm-lock.yaml
ItsEeleeya Nov 29, 2025
e4434cf
Merge remote-tracking branch 'upstream/main' into next
ItsEeleeya Dec 3, 2025
78c5ca2
Merge branch '0.4.0-bits' into next
ItsEeleeya Dec 3, 2025
821645f
fix double cfg
ItsEeleeya Dec 3, 2025
5914222
Remove previously added min inner size limit for Settings window on m…
ItsEeleeya Dec 3, 2025
de97650
Merge branch 'main' into pr/1399
richiemcilroy Dec 4, 2025
17e6ecb
fmt
richiemcilroy Dec 4, 2025
a598262
fix
richiemcilroy Dec 4, 2025
51b78b0
oops (fix thing getting removed when resolving merge conflict)
ItsEeleeya Dec 4, 2025
b16cd8c
ScreenshotEditor traffic lights pos
ItsEeleeya Dec 4, 2025
e285de7
Fix Cropper visual in screenshot editor
ItsEeleeya Dec 4, 2025
eca16fd
Update windows.rs
ItsEeleeya Dec 4, 2025
96d33d9
Update package.json
ItsEeleeya Dec 4, 2025
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
237 changes: 148 additions & 89 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[workspace]
resolver = "2"
members = ["apps/cli", "apps/desktop/src-tauri", "crates/*", "crates/workspace-hack"]
members = [
"apps/cli",
"apps/desktop/src-tauri",
"crates/*",
"crates/workspace-hack",
]

[workspace.dependencies]
anyhow = { version = "1.0.86" }
Expand All @@ -17,7 +22,7 @@ tokio = { version = "1.39.3", features = [
"rt-multi-thread",
"time",
] }
tauri = { version = "2.5.0", features = ["specta"] }
tauri = { version = "2.9.3", features = ["specta"] }
specta = { version = "=2.0.0-rc.20", features = [
"derive",
"serde_json",
Expand Down Expand Up @@ -52,6 +57,7 @@ cidre = { git = "https://github.com/CapSoftware/cidre", rev = "bf84b67079a8", fe
"async",
"dispatch",
], default-features = false }
objc2 = "0.6.1"

windows = "0.60.0"
windows-core = "0.60"
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"devDependencies": {
"@fontsource/geist-sans": "^5.0.3",
"@iconify/json": "^2.2.239",
"@tauri-apps/cli": ">=2.1.0",
"@tauri-apps/cli": "^2.9.4",
"@total-typescript/ts-reset": "^0.6.1",
"@types/dom-webcodecs": "^0.1.11",
"@types/uuid": "^9.0.8",
Expand Down
70 changes: 36 additions & 34 deletions apps/desktop/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ swift-rs = { version = "1.0.6", features = ["build"] }

[dependencies]
tauri = { workspace = true, features = [
"macos-private-api",
"protocol-asset",
"tray-icon",
"image-png",
"devtools",
"macos-private-api",
"protocol-asset",
"tray-icon",
"image-png",
"devtools",
] }
tauri-specta = { version = "=2.0.0-rc.20", features = ["derive", "typescript"] }
tauri-plugin-dialog = "2.2.0"
tauri-plugin-fs = "2.2.0"
tauri-plugin-global-shortcut = "2.2.0"
tauri-plugin-http = "2.2.0"
tauri-plugin-notification = "2.2.0"
tauri-plugin-os = "2.2.0"
tauri-plugin-process = "2.2.0"
tauri-plugin-shell = "2.2.0"
tauri-plugin-single-instance = { version = "2.2.0", features = ["deep-link"] }
tauri-plugin-store = "2.2.0"
tauri-plugin-dialog = "2.4.0"
tauri-plugin-fs = "2.4.2"
tauri-plugin-global-shortcut = "2.3.0"
tauri-plugin-http = "2.5.2"
tauri-plugin-notification = "2.3.1"
tauri-plugin-os = "2.3.1"
tauri-plugin-process = "2.3.0"
tauri-plugin-shell = "2.3.1"
tauri-plugin-single-instance = { version = "2.3.4", features = ["deep-link"] }
tauri-plugin-store = "2.4.0"
tauri-plugin-updater = "2.9.0"
tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "v2" }
tauri-plugin-window-state = "2.2.0"
tauri-plugin-positioner = "2.2.0"
tauri-plugin-deep-link = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.1"
tauri-plugin-opener = "2.2.6"
tauri-plugin-window-state = "2.4.0"
tauri-plugin-positioner = "2.3.0"
tauri-plugin-deep-link = "2.4.3"
tauri-plugin-clipboard-manager = "2.3.0"
tauri-plugin-opener = "2.5.0"

serde = { workspace = true }
serde_json = "1.0.111"
Expand Down Expand Up @@ -109,32 +109,34 @@ async-stream = "0.3.6"
tracing-futures = { version = "0.2.5", features = ["futures-03"] }
tracing-opentelemetry = "0.32.0"
opentelemetry = "0.31.0"
opentelemetry-otlp = "0.31.0" #{ version = , features = ["http-proto", "reqwest-client"] }
opentelemetry-otlp = "0.31.0" #{ version = , features = ["http-proto", "reqwest-client"] }
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Remove the trailing comment.

As per coding guidelines, comments should not be added to code. The trailing comment #{ version = , features = ["http-proto", "reqwest-client"] } should be removed.

-opentelemetry-otlp = "0.31.0"                                                 #{ version = , features = ["http-proto", "reqwest-client"] }
+opentelemetry-otlp = "0.31.0"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
opentelemetry-otlp = "0.31.0" #{ version = , features = ["http-proto", "reqwest-client"] }
opentelemetry-otlp = "0.31.0"
🤖 Prompt for AI Agents 
In apps/desktop/src-tauri/Cargo.toml around line 112, remove the trailing inline
comment "#{ version = , features = ["http-proto", "reqwest-client"] }" so the
dependency line reads only the valid TOML entry (opentelemetry-otlp = "0.31.0")
with no trailing comments; ensure no leftover characters remain and the file
still parses as valid TOML.

opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio", "trace"] }
posthog-rs = "0.3.7"
workspace-hack = { version = "0.1", path = "../../../crates/workspace-hack" }


[target.'cfg(target_os = "macos")'.dependencies]
core-graphics = "0.24.0"
core-foundation = "0.10.0"
objc2-app-kit = { version = "0.3.0", features = [
"NSWindow",
"NSResponder",
"NSHapticFeedback",
objc2.workspace = true
dispatch2 = "0.3.0"
block2 = "0.6.2"
objc2-foundation = "0.3.2"
objc2-application-services = "0.3.2"
objc2-core-foundation = "0.3.2"
objc2-core-graphics = "0.3.2"
objc2-app-kit = { version = "0.3.2", features = [
"NSWindow",
"NSResponder",
"NSHapticFeedback",
] }
cocoa = "0.26.0"
objc = "0.2.7"
swift-rs = "1.0.6"
tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
cidre = { workspace = true }

[target.'cfg(target_os= "windows")'.dependencies]
windows = { workspace = true, features = [
"Win32_Foundation",
"Win32_System",
"Win32_UI_WindowsAndMessaging",
"Win32_Graphics_Gdi",
"Win32_Foundation",
"Win32_System",
"Win32_UI_WindowsAndMessaging",
"Win32_Graphics_Gdi",
] }
windows-sys = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/src/deeplink_actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
use tauri::{AppHandle, Manager, Url};
use tracing::trace;

use crate::{App, ArcLock, recording::StartRecordingInputs, windows::ShowCapWindow};
use crate::{App, ArcLock, recording::StartRecordingInputs, windows::CapWindow};

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
Expand Down Expand Up @@ -150,7 +150,7 @@ impl DeepLinkAction {
crate::open_project_from_path(Path::new(&project_path), app.clone())
}
DeepLinkAction::OpenSettings { page } => {
crate::show_window(app.clone(), ShowCapWindow::Settings { page }).await
crate::show_window(app.clone(), CapWindow::Settings { page }).await
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/src/hotkeys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
RequestOpenRecordingPicker, RequestStartRecording, recording,
recording_settings::RecordingTargetMode, windows::ShowCapWindow,
recording_settings::RecordingTargetMode, windows::CapWindow,
};
use global_hotkey::HotKeyState;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -96,7 +96,7 @@ pub fn init(app: &AppHandle) {
if shortcut.key == Code::Comma && shortcut.mods == Modifiers::META {
let app = app.clone();
tokio::spawn(async move {
let _ = ShowCapWindow::Settings { page: None }.show(&app).await;
let _ = CapWindow::Settings { page: None }.show(&app).await;
});
}

Expand Down
Loading
Loading