mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 09:49:15 +03:00
f391ccfe53
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.
74 lines
1.7 KiB
C++
74 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/DeprecatedString.h>
|
|
#include <LibGfx/Point.h>
|
|
#include <LibGfx/Rect.h>
|
|
#include <LibIPC/Decoder.h>
|
|
#include <LibIPC/Encoder.h>
|
|
|
|
namespace Gfx {
|
|
|
|
template<typename T>
|
|
void Point<T>::constrain(Rect<T> const& rect)
|
|
{
|
|
m_x = AK::clamp<T>(x(), rect.left(), rect.right() - 1);
|
|
m_y = AK::clamp<T>(y(), rect.top(), rect.bottom() - 1);
|
|
}
|
|
|
|
template<typename T>
|
|
[[nodiscard]] Point<T> Point<T>::end_point_for_aspect_ratio(Point<T> const& previous_end_point, float aspect_ratio) const
|
|
{
|
|
VERIFY(aspect_ratio > 0);
|
|
const T x_sign = previous_end_point.x() >= x() ? 1 : -1;
|
|
const T y_sign = previous_end_point.y() >= y() ? 1 : -1;
|
|
T dx = AK::abs(previous_end_point.x() - x());
|
|
T dy = AK::abs(previous_end_point.y() - y());
|
|
if (dx > dy) {
|
|
dy = (T)((float)dx / aspect_ratio);
|
|
} else {
|
|
dx = (T)((float)dy * aspect_ratio);
|
|
}
|
|
return { x() + x_sign * dx, y() + y_sign * dy };
|
|
}
|
|
|
|
template<>
|
|
DeprecatedString IntPoint::to_deprecated_string() const
|
|
{
|
|
return DeprecatedString::formatted("[{},{}]", x(), y());
|
|
}
|
|
|
|
template<>
|
|
DeprecatedString FloatPoint::to_deprecated_string() const
|
|
{
|
|
return DeprecatedString::formatted("[{},{}]", x(), y());
|
|
}
|
|
|
|
}
|
|
|
|
namespace IPC {
|
|
|
|
template<>
|
|
ErrorOr<void> encode(Encoder& encoder, Gfx::IntPoint const& point)
|
|
{
|
|
TRY(encoder.encode(point.x()));
|
|
TRY(encoder.encode(point.y()));
|
|
return {};
|
|
}
|
|
|
|
template<>
|
|
ErrorOr<Gfx::IntPoint> decode(Decoder& decoder)
|
|
{
|
|
auto x = TRY(decoder.decode<int>());
|
|
auto y = TRY(decoder.decode<int>());
|
|
return Gfx::IntPoint { x, y };
|
|
}
|
|
|
|
}
|
|
|
|
template class Gfx::Point<int>;
|
|
template class Gfx::Point<float>;
|