RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:38:11 +00:00
Code Issues Activity Actions

LibGfx+Everywhere: Change Gfx::Rect to be endpoint exclusive

Browse source 
Previously, calling `.right()` on a `Gfx::Rect` would return the last
column's coordinate still inside the rectangle, or `left + width - 1`.
This is called 'endpoint inclusive' and does not make a lot of sense for
`Gfx::Rect<float>` where a rectangle of width 5 at position (0, 0) would
return 4 as its right side. This same problem exists for `.bottom()`.

This changes `Gfx::Rect` to be endpoint exclusive, which gives us the
nice property that `width = right - left` and `height = bottom - top`.
It enables us to treat `Gfx::Rect<int>` and `Gfx::Rect<float>` exactly
the same.

All users of `Gfx::Rect` have been updated accordingly.
This commit is contained in:
Jelle Raaijmakers 2023-05-22 00:41:18 +02:00 • committed by Andreas Kling
parent b7f4363791
commit f391ccfe53
88 changed files with 524 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -887,7 +887,7 @@ bool WindowManager::process_ongoing_window_move(MouseEvent& event)
apply_window_tile(WindowTileType::Right);
} else if (allow_tile && event_location_relative_to_screen.y() <= secondary_deadzone + desktop_relative_to_screen.top()) {
apply_window_tile(WindowTileType::Top);
} else if (allow_tile && event_location_relative_to_screen.y() >= desktop_relative_to_screen.bottom() - secondary_deadzone) {
} else if (allow_tile && event_location_relative_to_screen.y() >= desktop_relative_to_screen.bottom() - 1 - secondary_deadzone) {
apply_window_tile(WindowTileType::Bottom);
} else if (!m_move_window->is_tiled()) {
apply_window_tile(WindowTileType::None);
@ -971,12 +971,12 @@ bool WindowManager::process_ongoing_window_resize(MouseEvent const& event)
constexpr auto hot_zone = 10;
Gfx::IntRect tiling_rect = desktop_rect(cursor_screen).shrunken({ hot_zone, hot_zone });
if ((m_resize_direction == ResizeDirection::Up || m_resize_direction == ResizeDirection::Down)
&& (event.y() >= tiling_rect.bottom() || event.y() <= tiling_rect.top())) {
&& (event.y() >= tiling_rect.bottom() - 1 || event.y() <= tiling_rect.top())) {
m_resize_window->set_tiled(WindowTileType::VerticallyMaximized);
return true;
}
if ((m_resize_direction == ResizeDirection::Left || m_resize_direction == ResizeDirection::Right)
&& (event.x() >= tiling_rect.right() || event.x() <= tiling_rect.left())) {
&& (event.x() > tiling_rect.right() || event.x() <= tiling_rect.left())) {
m_resize_window->set_tiled(WindowTileType::HorizontallyMaximized);
return true;
}