New Cropper across the app (#1079)

* New Cropper, updated CaptureArea window

* Fix capture-area nswindow layer, close button on CapErrorBoundary, Remove haptics toggle

* Remove unused CropAreaRenderer and Box.

* Add default capability "core:resources:allow-close" to properly close menus

* Properly disable Confirm button when crop size is too small

* Cropper double click,

* Use new cropper in target-select-overlay

* Don't fill when double clicking selected region. Only the container

* oops

* Ensure editor project has a first segment in editor cropper, better invalid cropper state error message

* Delete canvas.ts

* Remove unused calculations in Cropper

* Add hard minSize to target-select-overlay cropper, apply ratio snapping after size constraint checks

* Ensure the new selection controls can't go under the notch on macos

* Update tauri.ts

* Update general.tsx

* nit

* move event def to Rust

* (Fix) Use the new cropper again in target-select-overlay

* Cropper: Stop resizing in aspect ratio mode towards the opposite side.

* Add alt mode indicator

* fix the close button i broke

* Add minimum size warning

* Ensure `createKeyDownSignal` handles blur event

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fix "ResizeObserver loop completed with undelivered notifications."

* biome

* render latest frame in the cropper and pause playback when opening it

* some tweaks

* rendering current would have drawbacks

* ts

* use named export + attach pointermove to window instead of container

* formatting

* final fixes

---------

Co-authored-by: ameer2468 <[email protected]>
Co-authored-by: Richie McIlroy <[email protected]>
Co-authored-by: Oscar Beaumont <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Brendan Allan <[email protected]>

Author: 6 people

apps/desktop/src-tauri/capabilities/default.json

@@ -24,6 +24,7 @@
 		"core:path:default",
 		"core:event:default",
 		"core:menu:default",
+		"core:resources:allow-close",
 		"core:window:default",
 		"core:window:allow-close",
 		"core:window:allow-destroy",

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

@@ -70,8 +70,6 @@ pub struct GeneralSettingsStore {
     pub upload_individual_files: bool,
     #[serde(default)]
     pub hide_dock_icon: bool,
-    #[serde(default = "true_b")]
-    pub haptics_enabled: bool,
     #[serde(default)]
     pub auto_create_shareable_link: bool,
     #[serde(default = "true_b")]
@@ -166,7 +164,6 @@ impl Default for GeneralSettingsStore {
             instance_id: uuid::Uuid::new_v4(),
             upload_individual_files: false,
             hide_dock_icon: false,
-            haptics_enabled: true,
             auto_create_shareable_link: false,
             enable_notifications: true,
             disable_auto_open_links: false,

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

@@ -285,6 +285,9 @@ pub struct RecordingDeleted {
     path: PathBuf,
 }
 
+#[derive(specta::Type, tauri_specta::Event, Serialize)]
+pub struct SetCaptureAreaPending(bool);
+
 #[derive(Deserialize, specta::Type, Serialize, tauri_specta::Event, Debug, Clone)]
 pub struct NewScreenshotAdded {
     path: PathBuf,
@@ -1920,6 +1923,7 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
             target_select_overlay::TargetUnderCursor,
             hotkeys::OnEscapePress,
             upload::UploadProgressEvent,
+            SetCaptureAreaPending,
         ])
         .error_handling(tauri_specta::ErrorHandlingMode::Throw)
         .typ::<ProjectConfiguration>()

apps/desktop/src-tauri/src/platform/mod.rs

@@ -11,6 +11,7 @@ pub use macos::*;
 use tracing::instrument;
 
 #[derive(Debug, Serialize, Deserialize, Type, Default)]
+#[serde(rename_all = "camelCase")]
 #[repr(isize)]
 pub enum HapticPattern {
     Alignment = 0,
@@ -20,6 +21,7 @@ pub enum HapticPattern {
 }
 
 #[derive(Debug, Serialize, Deserialize, Type, Default)]
+#[serde(rename_all = "camelCase")]
 #[repr(usize)]
 pub enum HapticPerformanceTime {
     Default = 0,

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

@@ -578,6 +578,7 @@ impl ShowCapWindow {
                     .maximized(false)
                     .fullscreen(false)
                     .shadow(false)
+                    .resizable(false)
                     .always_on_top(true)
                     .content_protected(should_protect)
                     .skip_taskbar(true)
@@ -608,7 +609,7 @@ impl ShowCapWindow {
                 #[cfg(target_os = "macos")]
                 crate::platform::set_window_level(
                     window.as_ref().window(),
-                    objc2_app_kit::NSScreenSaverWindowLevel,
+                    objc2_app_kit::NSPopUpMenuWindowLevel,
                 );
 
                 // Hide the main window if the target monitor is the same

apps/desktop/src/components/CapErrorBoundary.tsx

@@ -1,4 +1,5 @@
 import { Button } from "@cap/ui-solid";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { ErrorBoundary, type ParentProps } from "solid-js";
 
@@ -32,6 +33,12 @@ export function CapErrorBoundary(props: ParentProps) {
 							>
 								Reload
 							</Button>
+							<Button
+								onClick={() => getCurrentWebviewWindow().close()}
+								variant="destructive"
+							>
+								Close
+							</Button>
 						</div>
 
 						{import.meta.env.DEV && (