From d22aa851cfa72688d1b0d741308daaf618add7f7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Sun, 29 Oct 2023 00:25:13 +0200 Subject: [PATCH] LibWeb: Float property should be ignored for grid items --- .../LibWeb/Layout/expected/grid/floating-item.txt | 11 +++++++++++ Tests/LibWeb/Layout/input/grid/floating-item.html | 15 +++++++++++++++ .../LibWeb/Layout/GridFormattingContext.h | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 Tests/LibWeb/Layout/expected/grid/floating-item.txt create mode 100644 Tests/LibWeb/Layout/input/grid/floating-item.html diff --git a/Tests/LibWeb/Layout/expected/grid/floating-item.txt b/Tests/LibWeb/Layout/expected/grid/floating-item.txt new file mode 100644 index 0000000000..b1fc503949 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/floating-item.txt @@ -0,0 +1,11 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (1,1) content-size 798x122 [BFC] children: not-inline + BlockContainer at (10,10) content-size 780x104 children: not-inline + Box at (11,11) content-size 778x102 [GFC] children: not-inline + BlockContainer at (12,12) content-size 100x100 floating [BFC] children: not-inline + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x124] + PaintableWithLines (BlockContainer) [9,9 782x106] + PaintableBox (Box
.grid) [10,10 780x104] + PaintableWithLines (BlockContainer
.float-left) [11,11 102x102] diff --git a/Tests/LibWeb/Layout/input/grid/floating-item.html b/Tests/LibWeb/Layout/input/grid/floating-item.html new file mode 100644 index 0000000000..09064dc913 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/floating-item.html @@ -0,0 +1,15 @@ +
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h index ee88c04503..a5cbcc16d9 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h @@ -97,6 +97,8 @@ public: explicit GridFormattingContext(LayoutState&, Box const& grid_container, FormattingContext* parent); ~GridFormattingContext(); + virtual bool inhibits_floating() const override { return true; } + virtual void run(Box const&, LayoutMode, AvailableSpace const& available_space) override; virtual CSSPixels automatic_content_width() const override; virtual CSSPixels automatic_content_height() const override;