New Cropper across the app

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

@@ -293,6 +293,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,
@@ -2061,6 +2064,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 && (