Selaa lähdekoodia

LibWeb: Allow font-size as an SVG attribute and handle font scaling

MacDue 1 vuosi sitten
vanhempi
commit
48d03a68e9

+ 9 - 2
Userland/Libraries/LibWeb/Painting/SVGTextPaintable.cpp

@@ -59,9 +59,16 @@ void SVGTextPaintable::paint(PaintContext& context, PaintPhase phase) const
     auto child_text_content = dom_node.child_text_content();
 
     auto transform = layout_box().layout_transform();
-    auto& scaled_font = layout_node().scaled_font(context);
+    if (!transform.has_value())
+        return;
+
+    // FIXME: Support arbitrary path transforms for fonts.
+    // FIMXE: This assumes transform->x_scale() == transform->y_scale().
+    auto& scaled_font = layout_node().scaled_font(static_cast<float>(context.device_pixels_per_css_pixel()) * transform->x_scale());
+
+    Utf8View text_content { child_text_content };
     auto text_offset = context.floored_device_point(dom_node.get_offset().transformed(*transform).to_type<CSSPixels>());
-    painter.draw_text_run(text_offset.to_type<int>(), Utf8View { child_text_content }, scaled_font, layout_node().computed_values().fill()->as_color());
+    painter.draw_text_run(text_offset.to_type<int>(), text_content, scaled_font, layout_node().computed_values().fill()->as_color());
 }
 
 }

+ 6 - 0
Userland/Libraries/LibWeb/SVG/SVGGraphicsElement.cpp

@@ -142,6 +142,12 @@ void SVGGraphicsElement::apply_presentational_hints(CSS::StyleProperties& style)
         } else if (name.equals_ignoring_ascii_case(SVG::AttributeNames::opacity)) {
             if (auto stroke_opacity_value = parse_css_value(parsing_context, value, CSS::PropertyID::Opacity).release_value_but_fixme_should_propagate_errors())
                 style.set_property(CSS::PropertyID::Opacity, stroke_opacity_value.release_nonnull());
+        } else if (name.equals_ignoring_ascii_case("text-anchor"sv)) {
+            if (auto text_anchor_value = parse_css_value(parsing_context, value, CSS::PropertyID::TextAnchor).release_value_but_fixme_should_propagate_errors())
+                style.set_property(CSS::PropertyID::TextAnchor, text_anchor_value.release_nonnull());
+        } else if (name.equals_ignoring_ascii_case("font-size"sv)) {
+            if (auto font_size_value = parse_css_value(parsing_context, value, CSS::PropertyID::FontSize).release_value_but_fixme_should_propagate_errors())
+                style.set_property(CSS::PropertyID::FontSize, font_size_value.release_nonnull());
         }
     });
 }