From 00114ab01dff8a0916840c89f0fc3bc288b7de15 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Thu, 15 Apr 2021 20:36:10 +0300 Subject: [PATCH] LibWeb: Add a naive implemention of CanvasRenderingContext2D::fill_text This doesnt actually account for several unimplemented attributes (like ltr/rtl, alignment, etc) yet, so this should be expanded in the future. --- .../LibWeb/HTML/CanvasRenderingContext2D.cpp | 16 ++++++++++++++++ .../LibWeb/HTML/CanvasRenderingContext2D.h | 2 ++ .../LibWeb/HTML/CanvasRenderingContext2D.idl | 2 ++ 3 files changed, 20 insertions(+) diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index 00bc5029f2..0a8bfa7ab2 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp @@ -163,6 +163,22 @@ OwnPtr CanvasRenderingContext2D::painter() return make(*m_element->bitmap()); } +void CanvasRenderingContext2D::fill_text(const String& text, float x, float y, Optional max_width) +{ + if (max_width.has_value() && max_width.value() <= 0) + return; + + auto painter = this->painter(); + if (!painter) + return; + + // FIXME: painter only supports integer rects for text right now, so this effectively chops off any fractional position + auto text_rect = Gfx::IntRect(x, y, max_width.has_value() ? max_width.value() : painter->font().width(text), painter->font().glyph_height()); + auto transformed_rect = m_transform.map(text_rect); + painter->draw_text(transformed_rect, text, Gfx::TextAlignment::TopLeft, m_fill_style); + did_draw(transformed_rect.to()); +} + void CanvasRenderingContext2D::begin_path() { m_path = Gfx::Path(); diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h index c083f1b574..53f5674b52 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.h @@ -80,6 +80,8 @@ public: void rect(float x, float y, float width, float height); void stroke(); + void fill_text(const String&, float x, float y, Optional max_width); + // FIXME: We should only have one fill(), really. Fix the wrapper generator! void fill(Gfx::Painter::WindingRule); void fill(const String& fill_rule); diff --git a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl index 25b87241fb..c5a5b7bf6f 100644 --- a/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl +++ b/Userland/Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl @@ -20,6 +20,8 @@ interface CanvasRenderingContext2D { undefined ellipse(double x, double y, double radiusX, double radiusY, double rotation, double startAngle, double endAngle, optional boolean counterclockwise = false); undefined rect(double x, double y, double width, double height); + undefined fillText(DOMString text, double x, double y, optional double maxWidth); + undefined drawImage(HTMLImageElement image, double dx, double dy); attribute DOMString fillStyle;