Skip to content

Commit 823deac

Browse files
adriankiezikgmta
authored andcommitted
LibWeb: Implement CanvasRenderingContext2D direction property
When direction is 'rtl': - textAlign='start' now aligns text to the right - textAlign='end' now aligns text to the left Fixes the FIXME at CanvasRenderingContext2D.cpp:283
1 parent ffcd3a4 commit 823deac

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

Libraries/LibWeb/HTML/Canvas/CanvasState.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class CanvasState {
102102
RefPtr<Gfx::FontCascadeList const> current_font_cascade_list { nullptr };
103103
Bindings::CanvasTextAlign text_align { Bindings::CanvasTextAlign::Start };
104104
Bindings::CanvasTextBaseline text_baseline { Bindings::CanvasTextBaseline::Alphabetic };
105+
Bindings::CanvasDirection direction { Bindings::CanvasDirection::Inherit };
105106
};
106107
DrawingState& drawing_state() { return m_drawing_state; }
107108
DrawingState const& drawing_state() const { return m_drawing_state; }

Libraries/LibWeb/HTML/Canvas/CanvasTextDrawingStyles.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ class CanvasTextDrawingStyles {
2727
Bindings::CanvasTextBaseline text_baseline() const { return my_drawing_state().text_baseline; }
2828
void set_text_baseline(Bindings::CanvasTextBaseline text_baseline) { my_drawing_state().text_baseline = text_baseline; }
2929

30+
Bindings::CanvasDirection direction() const { return my_drawing_state().direction; }
31+
void set_direction(Bindings::CanvasDirection direction) { my_drawing_state().direction = direction; }
32+
3033
protected:
3134
CanvasTextDrawingStyles() = default;
3235

Libraries/LibWeb/HTML/Canvas/CanvasTextDrawingStyles.idl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// https://html.spec.whatwg.org/multipage/canvas.html#canvastextalign
44
// enum CanvasTextAlign { "start", "end", "left", "right", "center" };
55
// enum CanvasTextBaseline { "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" };
6-
enum CanvasDirection { "ltr", "rtl", "inherit" };
6+
// enum CanvasDirection { "ltr", "rtl", "inherit" };
77
enum CanvasFontKerning { "auto", "normal", "none" };
88
enum CanvasFontStretch { "ultra-condensed", "extra-condensed", "condensed", "semi-condensed", "normal", "semi-expanded", "expanded", "extra-expanded", "ultra-expanded" };
99
enum CanvasFontVariantCaps { "normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps" };
@@ -16,7 +16,7 @@ interface mixin CanvasTextDrawingStyles {
1616
attribute DOMString font; // (default 10px sans-serif)
1717
attribute CanvasTextAlign textAlign; // (default: "start")
1818
attribute CanvasTextBaseline textBaseline; // (default: "alphabetic")
19-
[FIXME] attribute CanvasDirection direction; // (default: "inherit")
19+
attribute CanvasDirection direction; // (default: "inherit")
2020
[FIXME] attribute DOMString letterSpacing; // (default: "0px")
2121
[FIXME] attribute CanvasFontKerning fontKerning; // (default: "auto")
2222
[FIXME] attribute CanvasFontStretch fontStretch; // (default: "normal")

Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,39 @@ Gfx::Path CanvasRenderingContext2D::text_path(Utf16String const& text, float x,
286286
}
287287

288288
// Apply text align
289-
// FIXME: CanvasTextAlign::Start and CanvasTextAlign::End currently do not nothing for right-to-left languages:
290-
// https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-textalign-start
291-
// Default alignment of draw_text is left so do nothing by CanvasTextAlign::Start and CanvasTextAlign::Left
289+
// https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-textalign
290+
// The direction property affects how "start" and "end" are interpreted:
291+
// - "ltr" or "inherit" (default): start=left, end=right
292+
// - "rtl": start=right, end=left
293+
294+
// Determine if we're in RTL mode
295+
bool is_rtl = drawing_state.direction == Bindings::CanvasDirection::Rtl;
296+
297+
// Center alignment is the same regardless of direction
292298
if (drawing_state.text_align == Bindings::CanvasTextAlign::Center) {
293299
transform = Gfx::AffineTransform {}.set_translation({ -text_width / 2, 0 }).multiply(transform);
294300
}
295-
if (drawing_state.text_align == Bindings::CanvasTextAlign::End || drawing_state.text_align == Bindings::CanvasTextAlign::Right) {
301+
// Handle "start" alignment
302+
else if (drawing_state.text_align == Bindings::CanvasTextAlign::Start) {
303+
// In RTL, "start" means right-aligned (translate by full width)
304+
if (is_rtl) {
305+
transform = Gfx::AffineTransform {}.set_translation({ -text_width, 0 }).multiply(transform);
306+
}
307+
// In LTR, "start" means left-aligned (no translation needed - default)
308+
}
309+
// Handle "end" alignment
310+
else if (drawing_state.text_align == Bindings::CanvasTextAlign::End) {
311+
// In RTL, "end" means left-aligned (no translation needed)
312+
if (!is_rtl) {
313+
// In LTR, "end" means right-aligned (translate by full width)
314+
transform = Gfx::AffineTransform {}.set_translation({ -text_width, 0 }).multiply(transform);
315+
}
316+
}
317+
// Explicit "left" and "right" alignments ignore direction
318+
else if (drawing_state.text_align == Bindings::CanvasTextAlign::Right) {
296319
transform = Gfx::AffineTransform {}.set_translation({ -text_width, 0 }).multiply(transform);
297320
}
321+
// Left is the default - no translation needed
298322

299323
// Apply text baseline
300324
// FIXME: Implement CanvasTextBaseline::Hanging, Bindings::CanvasTextAlign::Alphabetic and Bindings::CanvasTextAlign::Ideographic for real

Libraries/LibWeb/HTML/CanvasRenderingContext2D.idl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ enum CanvasLineJoin { "round", "bevel", "miter" };
4141
// FIXME: This should be in CanvasTextDrawingStyles.idl but then it is not exported
4242
enum CanvasTextAlign { "start", "end", "left", "right", "center" };
4343
enum CanvasTextBaseline { "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" };
44+
enum CanvasDirection { "ltr", "rtl", "inherit" };
4445

4546
// https://html.spec.whatwg.org/multipage/canvas.html#canvasrenderingcontext2d
4647
[Exposed=Window]

0 commit comments

Comments
 (0)