fix merge conflicts

Author: sammcj

src-tauri/src/lib.rs

@@ -211,30 +211,29 @@ pub fn run() {
     // when the variable is unset
     let console_filter = build_console_filter();
 
-    let mut builder = tauri::Builder::default()
-        .plugin(
-            LogBuilder::new()
-                .level(log::LevelFilter::Trace) // Set to most verbose level globally
-                .max_file_size(500_000)
-                .rotation_strategy(RotationStrategy::KeepOne)
-                .clear_targets()
-                .targets([
-                    // Console output respects RUST_LOG environment variable
-                    Target::new(TargetKind::Stdout).filter({
-                        let console_filter = console_filter.clone();
-                        move |metadata| console_filter.enabled(metadata)
-                    }),
-                    // File logs respect the user's settings (stored in FILE_LOG_LEVEL atomic)
-                    Target::new(TargetKind::LogDir {
-                        file_name: Some("handy".into()),
-                    })
-                    .filter(|metadata| {
-                        let file_level = FILE_LOG_LEVEL.load(Ordering::Relaxed);
-                        metadata.level() <= level_filter_from_u8(file_level)
-                    }),
-                ])
-                .build(),
-        );
+    let mut builder = tauri::Builder::default().plugin(
+        LogBuilder::new()
+            .level(log::LevelFilter::Trace) // Set to most verbose level globally
+            .max_file_size(500_000)
+            .rotation_strategy(RotationStrategy::KeepOne)
+            .clear_targets()
+            .targets([
+                // Console output respects RUST_LOG environment variable
+                Target::new(TargetKind::Stdout).filter({
+                    let console_filter = console_filter.clone();
+                    move |metadata| console_filter.enabled(metadata)
+                }),
+                // File logs respect the user's settings (stored in FILE_LOG_LEVEL atomic)
+                Target::new(TargetKind::LogDir {
+                    file_name: Some("handy".into()),
+                })
+                .filter(|metadata| {
+                    let file_level = FILE_LOG_LEVEL.load(Ordering::Relaxed);
+                    metadata.level() <= level_filter_from_u8(file_level)
+                }),
+            ])
+            .build(),
+    );
 
     #[cfg(target_os = "macos")]
     {

src-tauri/src/overlay.rs

@@ -146,32 +146,26 @@ pub fn create_recording_overlay(app_handle: &AppHandle) {
     if let Some((x, y)) = calculate_overlay_position(app_handle) {
         // PanelBuilder creates a Tauri window then converts it to NSPanel.
         // The window remains registered, so get_webview_window() still works.
-        match PanelBuilder::<_, RecordingOverlayPanel>::new(
-            app_handle,
-            "recording_overlay"
-        )
-        .url(WebviewUrl::App("src/overlay/index.html".into()))
-        .title("Recording")
-        .position(tauri::Position::Logical(tauri::LogicalPosition { x, y }))
-        .level(PanelLevel::Status)
-        .size(tauri::Size::Logical(tauri::LogicalSize {
-            width: OVERLAY_WIDTH,
-            height: OVERLAY_HEIGHT
-        }))
-        .has_shadow(false)
-        .transparent(true)
-        .no_activate(true)
-        .corner_radius(0.0)
-        .with_window(|w| {
-            w.decorations(false)
-                .transparent(true)
-        })
-        .collection_behavior(
-            CollectionBehavior::new()
-                .can_join_all_spaces()
-                .full_screen_auxiliary()
-        )
-        .build()
+        match PanelBuilder::<_, RecordingOverlayPanel>::new(app_handle, "recording_overlay")
+            .url(WebviewUrl::App("src/overlay/index.html".into()))
+            .title("Recording")
+            .position(tauri::Position::Logical(tauri::LogicalPosition { x, y }))
+            .level(PanelLevel::Status)
+            .size(tauri::Size::Logical(tauri::LogicalSize {
+                width: OVERLAY_WIDTH,
+                height: OVERLAY_HEIGHT,
+            }))
+            .has_shadow(false)
+            .transparent(true)
+            .no_activate(true)
+            .corner_radius(0.0)
+            .with_window(|w| w.decorations(false).transparent(true))
+            .collection_behavior(
+                CollectionBehavior::new()
+                    .can_join_all_spaces()
+                    .full_screen_auxiliary(),
+            )
+            .build()
         {
             Ok(panel) => {
                 let _ = panel.hide();
@@ -194,7 +188,8 @@ pub fn show_recording_overlay(app_handle: &AppHandle) {
     if let Some(overlay_window) = app_handle.get_webview_window("recording_overlay") {
         // Update position before showing to prevent flicker from position changes
         if let Some((x, y)) = calculate_overlay_position(app_handle) {
-            let _ = overlay_window.set_position(tauri::Position::Logical(tauri::LogicalPosition { x, y }));
+            let _ = overlay_window
+                .set_position(tauri::Position::Logical(tauri::LogicalPosition { x, y }));
         }
 
         let _ = overlay_window.show();