tenseleyflow/hyprkvm / 3529085

Browse files

fix: use logical dimensions for monitor direction checks

Monitor positions are in logical coordinates but width/height from
Hyprland are physical. Fixed edge detection to convert physical
dimensions to logical (dividing by scale) for consistent comparisons.
Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
3529085313d88887d0a1f9d89de2f8a22b6dffbd
Parents
1ea754f
Tree
97a7dae

1 changed file

StatusFile+-
M hyprkvm-daemon/src/main.rs 18 8
hyprkvm-daemon/src/main.rsmodified
@@ -872,13 +872,18 @@ async fn run_daemon(config_path: &std::path::Path) -> anyhow::Result<()> {
872872
                                 };
873873
874874
                                 // Check if there's another monitor in the requested direction
875
+                                // Use logical dimensions (physical / scale) since positions are logical
875876
                                 let has_monitor_in_direction = monitors.iter().any(|m| {
876877
                                     if m.id == focused_monitor.id { return false; }
878
+                                    let m_logical_w = (m.width as f32 / m.scale).round() as i32;
879
+                                    let m_logical_h = (m.height as f32 / m.scale).round() as i32;
880
+                                    let focused_logical_w = (focused_monitor.width as f32 / focused_monitor.scale).round() as i32;
881
+                                    let focused_logical_h = (focused_monitor.height as f32 / focused_monitor.scale).round() as i32;
877882
                                     match direction {
878
-                                        Direction::Left => m.x + m.width as i32 <= focused_monitor.x,
879
-                                        Direction::Right => m.x >= focused_monitor.x + focused_monitor.width as i32,
880
-                                        Direction::Up => m.y + m.height as i32 <= focused_monitor.y,
881
-                                        Direction::Down => m.y >= focused_monitor.y + focused_monitor.height as i32,
883
+                                        Direction::Left => m.x + m_logical_w <= focused_monitor.x,
884
+                                        Direction::Right => m.x >= focused_monitor.x + focused_logical_w,
885
+                                        Direction::Up => m.y + m_logical_h <= focused_monitor.y,
886
+                                        Direction::Down => m.y >= focused_monitor.y + focused_logical_h,
882887
                                     }
883888
                                 });
884889
@@ -1692,13 +1697,18 @@ async fn run_daemon(config_path: &std::path::Path) -> anyhow::Result<()> {
16921697
                             };
16931698
16941699
                             // Check if there's another monitor in the requested direction
1700
+                            // Use logical dimensions (physical / scale) since positions are logical
16951701
                             let has_monitor_in_direction = monitors.iter().any(|m| {
16961702
                                 if m.id == focused_monitor.id { return false; }
1703
+                                let m_logical_w = (m.width as f32 / m.scale).round() as i32;
1704
+                                let m_logical_h = (m.height as f32 / m.scale).round() as i32;
1705
+                                let focused_logical_w = (focused_monitor.width as f32 / focused_monitor.scale).round() as i32;
1706
+                                let focused_logical_h = (focused_monitor.height as f32 / focused_monitor.scale).round() as i32;
16971707
                                 match direction {
1698
-                                    Direction::Left => m.x + m.width as i32 <= focused_monitor.x,
1699
-                                    Direction::Right => m.x >= focused_monitor.x + focused_monitor.width as i32,
1700
-                                    Direction::Up => m.y + m.height as i32 <= focused_monitor.y,
1701
-                                    Direction::Down => m.y >= focused_monitor.y + focused_monitor.height as i32,
1708
+                                    Direction::Left => m.x + m_logical_w <= focused_monitor.x,
1709
+                                    Direction::Right => m.x >= focused_monitor.x + focused_logical_w,
1710
+                                    Direction::Up => m.y + m_logical_h <= focused_monitor.y,
1711
+                                    Direction::Down => m.y >= focused_monitor.y + focused_logical_h,
17021712
                                 }
17031713
                             });
17041714