Skip to content

Commit 66f59a8

Browse files
committed
Merge branch 'main' into prewarming-sck
2 parents d8b34d1 + 9054998 commit 66f59a8

File tree

81 files changed

+4564
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+4564
-835
lines changed

.claude/settings.local.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(pnpm typecheck:*)",
5+
"Bash(pnpm lint:*)",
6+
"Bash(pnpm build:*)"
7+
],
8+
"deny": [],
9+
"ask": []
10+
}
11+
}

Cargo.lock

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

apps/desktop/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"posthog-js": "^1.215.3",
6060
"solid-js": "^1.9.3",
6161
"solid-markdown": "^2.0.13",
62+
"solid-motionone": "^1.0.4",
6263
"solid-presence": "^0.1.8",
6364
"solid-toast": "^0.5.0",
6465
"solid-transition-group": "^0.2.3",

apps/desktop/src-tauri/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ cap-flags = { path = "../../../crates/flags" }
8989
cap-recording = { path = "../../../crates/recording" }
9090
cap-export = { path = "../../../crates/export" }
9191
scap-targets = { path = "../../../crates/scap-targets" }
92+
scap-screencapturekit = { path = "../../../crates/scap-screencapturekit" }
93+
scap-direct3d = { path = "../../../crates/scap-direct3d" }
9294

9395
flume.workspace = true
9496
tracing-subscriber = "0.3.19"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,6 +1939,8 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
19391939
recording::list_cameras,
19401940
recording::list_capture_windows,
19411941
recording::list_capture_displays,
1942+
recording::list_displays_with_thumbnails,
1943+
recording::list_windows_with_thumbnails,
19421944
take_screenshot,
19431945
list_audio_devices,
19441946
close_recordings_overlay_window,
@@ -2005,6 +2007,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
20052007
target_select_overlay::close_target_select_overlays,
20062008
target_select_overlay::display_information,
20072009
target_select_overlay::get_window_icon,
2010+
target_select_overlay::focus_window,
20082011
editor_delete_project
20092012
])
20102013
.events(tauri_specta::collect_events![

0 commit comments

Comments
 (0)