Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6ba08c3
squash and resolve conflicts
oscartbeaumont Aug 13, 2025
480f9ae
format + build
oscartbeaumont Aug 13, 2025
d36f764
prevent target overlay ending up in recordings
oscartbeaumont Aug 13, 2025
6fc48b4
revert mistakr
oscartbeaumont Aug 13, 2025
1f341c6
fix area selection + remove wrong multi-monitor calc
oscartbeaumont Aug 13, 2025
cf754fb
Merge branch 'main' into new-recording-flow2
oscartbeaumont Aug 13, 2025
7003fd7
format
oscartbeaumont Aug 13, 2025
388b82b
fix multiple monitors
oscartbeaumont Aug 13, 2025
464c20c
enable new recording flow in dev by default
oscartbeaumont Aug 13, 2025
d44b129
cargo fmt
oscartbeaumont Aug 13, 2025
4c4ec72
Merge branch 'main' into new-recording-flow2
oscartbeaumont Aug 13, 2025
6dfd7a5
remove unused import
oscartbeaumont Aug 13, 2025
04b7b2f
minor fixes
oscartbeaumont Aug 13, 2025
4caff81
format
oscartbeaumont Aug 13, 2025
85b0284
screen working
oscartbeaumont Aug 13, 2025
81a0d09
i think this commit is bad
oscartbeaumont Aug 13, 2025
8d4cf51
Merge branch 'main' into new-recording-flow2
oscartbeaumont Aug 18, 2025
591bff4
Merge branch 'main' into new-recording-flow2
oscartbeaumont Aug 19, 2025
7032bde
hide target select overlay on launch
oscartbeaumont Aug 19, 2025
d475dfe
only a single monitor can have an area selection at once
oscartbeaumont Aug 19, 2025
fbe7f97
Merge branch 'main' into new-recording-flow2
oscartbeaumont Aug 22, 2025
f17ff8a
wip
oscartbeaumont Aug 22, 2025
6760846
fixes
oscartbeaumont Aug 22, 2025
4e2a9d3
fix macos screen select
oscartbeaumont Aug 22, 2025
e957f5d
fixes
oscartbeaumont Aug 22, 2025
062de55
cleanup win
oscartbeaumont Aug 22, 2025
df944f8
cleanup
oscartbeaumont Aug 22, 2025
e2a8fad
cleanup window deps
oscartbeaumont Aug 22, 2025
d4f26d0
format
oscartbeaumont Aug 22, 2025
43d3b81
rebase Brendan's changes back on
oscartbeaumont Aug 22, 2025
570038c
fix
oscartbeaumont Aug 22, 2025
45a6191
format
oscartbeaumont Aug 22, 2025
9a0f8d3
implement countdown
oscartbeaumont Aug 22, 2025
8b3c380
format
oscartbeaumont Aug 22, 2025
8e0d218
fix target select overlay bounds
Brendonovich Aug 22, 2025
2cb6554
refine design
Brendonovich Aug 22, 2025
edf1210
scap-targets
Brendonovich Aug 23, 2025
d028c9c
Merge branch 'main' into new-recording-flow3
Brendonovich Aug 25, 2025
e7fb69b
instant mode sign in
Brendonovich Aug 25, 2025
db4a7ab
microphone levels
Brendonovich Aug 25, 2025
30aef8e
checkbox menu items
Brendonovich Aug 25, 2025
aa9ebf9
re-enable content protected
Brendonovich Aug 25, 2025
aacbb31
Merge branch 'main' into new-recording-flow3
Brendonovich Aug 25, 2025
3cd60fe
rustfmt
oscartbeaumont Aug 25, 2025
58219b3
reopen overlay after settings is closed
oscartbeaumont Aug 25, 2025
69f567b
compile on windows plz
oscartbeaumont Aug 25, 2025
66659c4
wip: fix windows window selection
oscartbeaumont Aug 25, 2025
e8f0f43
wip: async icon loading
oscartbeaumont Aug 25, 2025
df93111
format + close target select overflow for countdown
oscartbeaumont Aug 25, 2025
181dc90
icon fallback state
oscartbeaumont Aug 25, 2025
ec2d38b
optimize windows icon loading
oscartbeaumont Aug 25, 2025
63ff653
cleanup exe filtering
oscartbeaumont Aug 25, 2025
6d7582a
fix
oscartbeaumont Aug 25, 2025
0980e85
format + remove log
oscartbeaumont Aug 25, 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
48 changes: 24 additions & 24 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion apps/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cap-flags = { path = "../../crates/flags" }
cap-recording = { path = "../../crates/recording" }
cap-export = { path = "../../crates/export" }
cap-camera = { path = "../../crates/camera" }
cap-displays = { path = "../../crates/displays" }
scap-targets = { path = "../../crates/scap-targets" }
serde = { workspace = true }
serde_json = "1.0.133"
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/src/record.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use cap_camera::ModelID;
use cap_displays::{DisplayId, WindowId};
use cap_recording::screen_capture::ScreenCaptureTarget;
use clap::Args;
use scap_targets::{DisplayId, WindowId};
use std::{env::current_dir, path::PathBuf, sync::Arc};
use tokio::{io::AsyncBufReadExt, sync::Mutex};
use uuid::Uuid;
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ cap-media = { path = "../../../crates/media" }
cap-flags = { path = "../../../crates/flags" }
cap-recording = { path = "../../../crates/recording" }
cap-export = { path = "../../../crates/export" }
cap-displays = { path = "../../../crates/displays" }
scap-targets = { path = "../../../crates/scap-targets" }

flume.workspace = true
tracing-subscriber = "0.3.19"
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/src/fake_window.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cap_displays::bounds::LogicalBounds;
use scap_targets::bounds::LogicalBounds;
use std::{collections::HashMap, sync::Arc, time::Duration};
use tauri::{AppHandle, Manager, WebviewWindow};
use tokio::{sync::RwLock, time::sleep};
Expand Down
3 changes: 1 addition & 2 deletions apps/desktop/src-tauri/src/general_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ fn default_enable_native_camera_preview() -> bool {
}

fn default_enable_new_recording_flow() -> bool {
false
// cfg!(debug_assertions)
cfg!(debug_assertions)
}

fn no(_: &bool) -> bool {
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/src/hotkeys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub fn init(app: &AppHandle) {
)
.unwrap();

let mut store = match HotkeysStore::get(app) {
let store = match HotkeysStore::get(app) {
Ok(Some(s)) => s,
Ok(None) => HotkeysStore::default(),
Err(e) => {
Expand Down
Loading
Loading