mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:07:34 +00:00
LibWeb: Convert Paintable coordinates to new pixel units
This fixes a few sizing issues too. The page size is now correct in most cases! \o/ We get to remove some of the `to_type<>()` shenanigans, though it reappears in some other places.
This commit is contained in:
parent
57a69f15ff
commit
ab49dbf137
39 changed files with 200 additions and 179 deletions
|
@ -6,9 +6,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <LibGfx/Forward.h>
|
||||
#include <LibGfx/Rect.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
#include <LibWeb/PixelUnits.h>
|
||||
|
||||
namespace Web::Layout {
|
||||
|
||||
|
@ -22,7 +22,7 @@ public:
|
|||
Trailing,
|
||||
};
|
||||
|
||||
LineBoxFragment(Node const& layout_node, int start, int length, Gfx::FloatPoint offset, Gfx::FloatSize size, float border_box_top, float border_box_bottom, Type type)
|
||||
LineBoxFragment(Node const& layout_node, int start, int length, CSSPixelPoint offset, CSSPixelSize size, CSSPixels border_box_top, CSSPixels border_box_bottom, Type type)
|
||||
: m_layout_node(layout_node)
|
||||
, m_start(start)
|
||||
, m_length(length)
|
||||
|
@ -37,45 +37,54 @@ public:
|
|||
Node const& layout_node() const { return m_layout_node; }
|
||||
int start() const { return m_start; }
|
||||
int length() const { return m_length; }
|
||||
const Gfx::FloatRect absolute_rect() const;
|
||||
CSSPixelRect const absolute_rect() const;
|
||||
Type type() const { return m_type; }
|
||||
|
||||
Gfx::FloatPoint offset() const { return m_offset; }
|
||||
void set_offset(Gfx::FloatPoint offset) { m_offset = offset; }
|
||||
CSSPixelPoint offset() const
|
||||
{
|
||||
return m_offset;
|
||||
}
|
||||
void set_offset(CSSPixelPoint offset) { m_offset = offset; }
|
||||
|
||||
// The baseline of a fragment is the number of pixels from the top to the text baseline.
|
||||
void set_baseline(float y) { m_baseline = y; }
|
||||
float baseline() const { return m_baseline; }
|
||||
void set_baseline(CSSPixels y) { m_baseline = y; }
|
||||
CSSPixels baseline() const { return m_baseline; }
|
||||
|
||||
Gfx::FloatSize size() const { return m_size; }
|
||||
void set_width(float width) { m_size.set_width(width); }
|
||||
void set_height(float height) { m_size.set_height(height); }
|
||||
float width() const { return m_size.width(); }
|
||||
float height() const { return m_size.height(); }
|
||||
CSSPixelSize size() const
|
||||
{
|
||||
return m_size;
|
||||
}
|
||||
void set_width(CSSPixels width) { m_size.set_width(width); }
|
||||
void set_height(CSSPixels height) { m_size.set_height(height); }
|
||||
CSSPixels width() const { return m_size.width(); }
|
||||
CSSPixels height() const { return m_size.height(); }
|
||||
|
||||
float border_box_height() const { return m_border_box_top + height() + m_border_box_bottom; }
|
||||
float border_box_top() const { return m_border_box_top; }
|
||||
float border_box_bottom() const { return m_border_box_bottom; }
|
||||
CSSPixels border_box_height() const
|
||||
{
|
||||
return m_border_box_top + height() + m_border_box_bottom;
|
||||
}
|
||||
CSSPixels border_box_top() const { return m_border_box_top; }
|
||||
CSSPixels border_box_bottom() const { return m_border_box_bottom; }
|
||||
|
||||
float absolute_x() const { return absolute_rect().x(); }
|
||||
CSSPixels absolute_x() const { return absolute_rect().x(); }
|
||||
|
||||
bool ends_in_whitespace() const;
|
||||
bool is_justifiable_whitespace() const;
|
||||
StringView text() const;
|
||||
|
||||
int text_index_at(float x) const;
|
||||
int text_index_at(CSSPixels x) const;
|
||||
|
||||
Gfx::FloatRect selection_rect(Gfx::Font const&) const;
|
||||
CSSPixelRect selection_rect(Gfx::Font const&) const;
|
||||
|
||||
private:
|
||||
Node const& m_layout_node;
|
||||
int m_start { 0 };
|
||||
int m_length { 0 };
|
||||
Gfx::FloatPoint m_offset;
|
||||
Gfx::FloatSize m_size;
|
||||
float m_border_box_top { 0 };
|
||||
float m_border_box_bottom { 0 };
|
||||
float m_baseline { 0 };
|
||||
CSSPixelPoint m_offset;
|
||||
CSSPixelSize m_size;
|
||||
CSSPixels m_border_box_top { 0 };
|
||||
CSSPixels m_border_box_bottom { 0 };
|
||||
CSSPixels m_baseline { 0 };
|
||||
Type m_type { Type::Normal };
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue