fix intersects for macos and fix Display label

Author: Brendonovich

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

@@ -255,13 +255,15 @@ impl ShowCapWindow {
                     return Err(tauri::Error::WindowNotFound);
                 };
 
-                let size = display.physical_size().unwrap();
-
                 #[cfg(target_os = "macos")]
                 let position = display.raw_handle().logical_position();
+                #[cfg(target_os = "macos")]
+                let size = display.logical_size().unwrap();
 
                 #[cfg(windows)]
                 let position = display.raw_handle().physical_position().unwrap();
+                #[cfg(windows)]
+                let size = display.physical_size().unwrap();
 
                 let mut window_builder = self
                     .window_builder(
@@ -479,7 +481,8 @@ impl ShowCapWindow {
                 if let Some(main_window) = CapWindowId::Main.get(app)
                     && let (Ok(outer_pos), Ok(outer_size)) =
                         (main_window.outer_position(), main_window.outer_size())
-                    && display.intersects(outer_pos, outer_size)
+                    && let Ok(scale_factor) = main_window.scale_factor()
+                    && display.intersects(outer_pos, outer_size, scale_factor)
                 {
                     let _ = main_window.minimize();
                 };
@@ -729,12 +732,44 @@ fn position_traffic_lights_impl(
 
 // Credits: tauri-plugin-window-state
 trait MonitorExt {
-    fn intersects(&self, position: PhysicalPosition<i32>, size: PhysicalSize<u32>) -> bool;
+    fn intersects(
+        &self,
+        position: PhysicalPosition<i32>,
+        size: PhysicalSize<u32>,
+        scale: f64,
+    ) -> bool;
 }
 
 impl MonitorExt for Display {
-    fn intersects(&self, position: PhysicalPosition<i32>, size: PhysicalSize<u32>) -> bool {
-        return false;
+    fn intersects(
+        &self,
+        position: PhysicalPosition<i32>,
+        size: PhysicalSize<u32>,
+        _scale: f64,
+    ) -> bool {
+        #[cfg(target_os = "macos")]
+        {
+            let Some(bounds) = self.raw_handle().logical_bounds() else {
+                return false;
+            };
+
+            let left = (bounds.position().x() * _scale) as i32;
+            let right = left + (bounds.size().width() * _scale) as i32;
+            let top = (bounds.position().y() * _scale) as i32;
+            let bottom = top + (bounds.size().height() * _scale) as i32;
+
+            [
+                (position.x, position.y),
+                (position.x + size.width as i32, position.y),
+                (position.x, position.y + size.height as i32),
+                (
+                    position.x + size.width as i32,
+                    position.y + size.height as i32,
+                ),
+            ]
+            .into_iter()
+            .any(|(x, y)| x >= left && x < right && y >= top && y < bottom)
+        }
 
         #[cfg(windows)]
         {

apps/desktop/src/routes/(window-chrome)/(main).tsx

@@ -424,7 +424,7 @@ function Page() {
 							);
 						}}
 						value={options.screen() ?? null}
-						placeholder="display"
+						placeholder="Display"
 						optionsEmptyText="No screens found"
 						selected={
 							rawOptions.captureTarget.variant === "display" ||

apps/desktop/src/routes/(window-chrome)/new-main.tsx

@@ -300,7 +300,7 @@ function Page() {
 							v === "display" ? null : "display",
 						)
 					}
-					name="display"
+					name="Display"
 				/>
 				<TargetTypeButton
 					selected={rawOptions.targetMode === "window"}