mirror of
https://github.com/RGBCube/serenity
synced 2025-07-10 12:17:35 +00:00
LibGfx+Everywhere: Change Gfx::Rect
to be endpoint exclusive
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:
parent
b7f4363791
commit
f391ccfe53
88 changed files with 524 additions and 518 deletions
|
@ -78,19 +78,19 @@ void MoveTool::on_mousemove(Layer* layer, MouseEvent& event)
|
|||
switch (m_resize_anchor_location.value()) {
|
||||
case ResizeAnchorLocation::TopLeft:
|
||||
scaling_origin = rect_being_moved.top_left();
|
||||
opposite_corner = rect_being_moved.bottom_right().translated(1, 1);
|
||||
opposite_corner = rect_being_moved.bottom_right();
|
||||
break;
|
||||
case ResizeAnchorLocation::BottomRight:
|
||||
scaling_origin = rect_being_moved.bottom_right().translated(1, 1);
|
||||
scaling_origin = rect_being_moved.bottom_right();
|
||||
opposite_corner = rect_being_moved.top_left();
|
||||
break;
|
||||
case ResizeAnchorLocation::BottomLeft:
|
||||
scaling_origin = rect_being_moved.bottom_left().translated(0, 1);
|
||||
opposite_corner = rect_being_moved.top_right().translated(1, 0);
|
||||
scaling_origin = rect_being_moved.bottom_left();
|
||||
opposite_corner = rect_being_moved.top_right();
|
||||
break;
|
||||
case ResizeAnchorLocation::TopRight:
|
||||
scaling_origin = rect_being_moved.top_right().translated(1, 0);
|
||||
opposite_corner = rect_being_moved.bottom_left().translated(0, 1);
|
||||
scaling_origin = rect_being_moved.top_right();
|
||||
opposite_corner = rect_being_moved.bottom_left();
|
||||
break;
|
||||
}
|
||||
scaling_origin.translate_by(delta);
|
||||
|
@ -233,9 +233,9 @@ Array<Gfx::IntRect, 4> MoveTool::resize_anchor_rects(Gfx::IntRect layer_rect_in_
|
|||
{
|
||||
return Array {
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.top_left(), resize_anchor_size),
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.top_right().translated(1, 0), resize_anchor_size),
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.bottom_left().translated(0, 1), resize_anchor_size),
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.bottom_right().translated(1), resize_anchor_size)
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.top_right(), resize_anchor_size),
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.bottom_left(), resize_anchor_size),
|
||||
resize_anchor_rect_from_position(layer_rect_in_frame_coordinates.bottom_right(), resize_anchor_size)
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -265,11 +265,11 @@ Optional<ResizeAnchorLocation const> MoveTool::resize_anchor_location_from_curso
|
|||
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.top_left()))
|
||||
return ResizeAnchorLocation::TopLeft;
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.top_right().translated(1, 0)))
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.top_right()))
|
||||
return ResizeAnchorLocation::TopRight;
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.bottom_left().translated(0, 1)))
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.bottom_left()))
|
||||
return ResizeAnchorLocation::BottomLeft;
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.bottom_right().translated(1)))
|
||||
if (cursor_within_resize_anchor_rect(layer_rect.bottom_right()))
|
||||
return ResizeAnchorLocation::BottomRight;
|
||||
return {};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue