mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 18:32:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Add .scaled_font() helper to Layout::Node

Browse source 
This returns the font scaled for the current zoom level.
This commit is contained in:
MacDue 2023-04-01 21:12:15 +01:00 • committed by Linus Groh
parent f3c450559f
commit 7061a3d8e6
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -14,6 +14,7 @@
#include <LibJS/Heap/Handle.h>
#include <LibWeb/CSS/ComputedValues.h>
#include <LibWeb/CSS/StyleProperties.h>
#include <LibWeb/FontCache.h>
#include <LibWeb/Forward.h>
#include <LibWeb/Layout/BoxModelMetrics.h>
#include <LibWeb/Painting/PaintContext.h>
@ -117,6 +118,8 @@ public:
bool can_contain_boxes_with_position_absolute() const;
Gfx::Font const& font() const;
Gfx::Font const& scaled_font(PaintContext&) const;
CSS::ImmutableComputedValues const& computed_values() const;
CSSPixels line_height() const;
@ -237,6 +240,11 @@ inline Gfx::Font const& Node::font() const
return parent()->font();
}
inline Gfx::Font const& Node::scaled_font(PaintContext& context) const
{
return *FontCache::the().scaled_font(font(), context.device_pixels_per_css_pixel());
}
inline const CSS::ImmutableComputedValues& Node::computed_values() const
{
if (m_has_style)

7
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -8,7 +8,6 @@
#include <AK/GenericShorthands.h>
#include <LibUnicode/CharacterTypes.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/FontCache.h>
#include <LibWeb/HTML/HTMLHtmlElement.h>
#include <LibWeb/Layout/BlockContainer.h>
#include <LibWeb/Layout/Viewport.h>
@ -525,16 +524,16 @@ static void paint_text_fragment(PaintContext& context, Layout::TextNode const& t
DevicePixelPoint baseline_start { fragment_absolute_device_rect.x(), fragment_absolute_device_rect.y() + context.rounded_device_pixels(fragment.baseline()) };
Utf8View view { text.substring_view(fragment.start(), fragment.length()) };
auto scaled_font = FontCache::the().scaled_font(fragment.layout_node().font(), context.device_pixels_per_css_pixel());
auto& scaled_font = fragment.layout_node().scaled_font(context);
painter.draw_text_run(baseline_start.to_type<int>(), view, *scaled_font, text_node.computed_values().color());
painter.draw_text_run(baseline_start.to_type<int>(), view, scaled_font, text_node.computed_values().color());
auto selection_rect = context.enclosing_device_rect(fragment.selection_rect(text_node.font())).to_type<int>();
if (!selection_rect.is_empty()) {
painter.fill_rect(selection_rect, context.palette().selection());
Gfx::PainterStateSaver saver(painter);
painter.add_clip_rect(selection_rect);
painter.draw_text_run(baseline_start.to_type<int>(), view, *scaled_font, context.palette().selection_text());
painter.draw_text_run(baseline_start.to_type<int>(), view, scaled_font, context.palette().selection_text());
}
paint_text_decoration(context, painter, text_node, fragment);