starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-25 10:08:33 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

fix(wm): correct float window move/resize

Browse Source 
This commit fixes an issue where the move/resize functions for floating
windows weren't properly taking into account the coordinates of
secondary monitors and were only working correctly on the main monitor
where top/left was 0/0.
This commit is contained in:
alex-ds13
2025-03-12 00:04:48 +00:00
committed by LGUG2Z
parent 54323c4c6a
commit 60e1834b43
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
komorebi/src/window_manager.rs
View File

@@ -1415,10 +1415,10 @@ impl WindowManager {
focused_monitor_work_area.left += border_width; focused_monitor_work_area.left += border_width;
focused_monitor_work_area.top += border_offset; focused_monitor_work_area.top += border_offset;
focused_monitor_work_area.top += border_width; focused_monitor_work_area.top += border_width;
focused_monitor_work_area.right -= border_offset; focused_monitor_work_area.right -= border_offset * 2;
focused_monitor_work_area.right -= border_width; focused_monitor_work_area.right -= border_width * 2;
focused_monitor_work_area.bottom -= border_offset; focused_monitor_work_area.bottom -= border_offset * 2;
focused_monitor_work_area.bottom -= border_width; focused_monitor_work_area.bottom -= border_width * 2;
for window in workspace.floating_windows().iter() { for window in workspace.floating_windows().iter() {
if window.hwnd == focused_hwnd { if window.hwnd == focused_hwnd {
@@ -1436,9 +1436,12 @@ impl WindowManager {
} }
(OperationDirection::Right, Sizing::Increase) => { (OperationDirection::Right, Sizing::Increase) => {
if rect.left + rect.right + delta * 2 if rect.left + rect.right + delta * 2
> focused_monitor_work_area.right > focused_monitor_work_area.left
+ focused_monitor_work_area.right
{ {
rect.right = focused_monitor_work_area.right - rect.left; rect.right = focused_monitor_work_area.left
+ focused_monitor_work_area.right
- rect.left;
} else { } else {
rect.right += delta * 2; rect.right += delta * 2;
} }
@@ -1458,9 +1461,12 @@ impl WindowManager {
} }
(OperationDirection::Down, Sizing::Increase) => { (OperationDirection::Down, Sizing::Increase) => {
if rect.top + rect.bottom + delta * 2 if rect.top + rect.bottom + delta * 2
> focused_monitor_work_area.bottom > focused_monitor_work_area.top
+ focused_monitor_work_area.bottom
{ {
rect.bottom = focused_monitor_work_area.bottom - rect.top; rect.bottom = focused_monitor_work_area.top
+ focused_monitor_work_area.bottom
- rect.top;
} else { } else {
rect.bottom += delta * 2; rect.bottom += delta * 2;
} }
@@ -2175,10 +2181,10 @@ impl WindowManager {
focused_monitor_work_area.left += border_width; focused_monitor_work_area.left += border_width;
focused_monitor_work_area.top += border_offset; focused_monitor_work_area.top += border_offset;
focused_monitor_work_area.top += border_width; focused_monitor_work_area.top += border_width;
focused_monitor_work_area.right -= border_offset; focused_monitor_work_area.right -= border_offset * 2;
focused_monitor_work_area.right -= border_width; focused_monitor_work_area.right -= border_width * 2;
focused_monitor_work_area.bottom -= border_offset; focused_monitor_work_area.bottom -= border_offset * 2;
focused_monitor_work_area.bottom -= border_width; focused_monitor_work_area.bottom -= border_width * 2;
let focused_workspace = self.focused_workspace()?; let focused_workspace = self.focused_workspace()?;
let delta = self.resize_delta; let delta = self.resize_delta;
@@ -2196,8 +2202,12 @@ impl WindowManager {
} }
} }
OperationDirection::Right => { OperationDirection::Right => {
if rect.left + delta + rect.right > focused_monitor_work_area.right { if rect.left + delta + rect.right
rect.left = focused_monitor_work_area.right - rect.right; > focused_monitor_work_area.left + focused_monitor_work_area.right
{
rect.left = focused_monitor_work_area.left
+ focused_monitor_work_area.right
- rect.right;
} else { } else {
rect.left += delta; rect.left += delta;
} }
@@ -2210,8 +2220,12 @@ impl WindowManager {
} }
} }
OperationDirection::Down => { OperationDirection::Down => {
if rect.top + delta + rect.bottom > focused_monitor_work_area.bottom { if rect.top + delta + rect.bottom
rect.top = focused_monitor_work_area.bottom - rect.bottom; > focused_monitor_work_area.top + focused_monitor_work_area.bottom
{
rect.top = focused_monitor_work_area.top
+ focused_monitor_work_area.bottom
- rect.bottom;
} else { } else {
rect.top += delta; rect.top += delta;
} }