mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 17:02:45 +00:00 
			
		
		
		
	LibWeb: Add LayoutTableRowGroup to implement display: table-row-group
This commit is contained in:
		
							parent
							
								
									b4d4d6b32a
								
							
						
					
					
						commit
						28dcef4757
					
				
					 6 changed files with 119 additions and 4 deletions
				
			
		|  | @ -87,6 +87,7 @@ set(SOURCES | ||||||
|     Layout/LayoutTable.cpp |     Layout/LayoutTable.cpp | ||||||
|     Layout/LayoutTableCell.cpp |     Layout/LayoutTableCell.cpp | ||||||
|     Layout/LayoutTableRow.cpp |     Layout/LayoutTableRow.cpp | ||||||
|  |     Layout/LayoutTableRowGroup.cpp | ||||||
|     Layout/LayoutText.cpp |     Layout/LayoutText.cpp | ||||||
|     Layout/LayoutTreeBuilder.cpp |     Layout/LayoutTreeBuilder.cpp | ||||||
|     Layout/LayoutWidget.cpp |     Layout/LayoutWidget.cpp | ||||||
|  |  | ||||||
|  | @ -39,6 +39,7 @@ | ||||||
| #include <LibWeb/Layout/LayoutTable.h> | #include <LibWeb/Layout/LayoutTable.h> | ||||||
| #include <LibWeb/Layout/LayoutTableCell.h> | #include <LibWeb/Layout/LayoutTableCell.h> | ||||||
| #include <LibWeb/Layout/LayoutTableRow.h> | #include <LibWeb/Layout/LayoutTableRow.h> | ||||||
|  | #include <LibWeb/Layout/LayoutTableRowGroup.h> | ||||||
| #include <LibWeb/Layout/LayoutTreeBuilder.h> | #include <LibWeb/Layout/LayoutTreeBuilder.h> | ||||||
| #include <LibWeb/Parser/HTMLParser.h> | #include <LibWeb/Parser/HTMLParser.h> | ||||||
| 
 | 
 | ||||||
|  | @ -130,6 +131,8 @@ RefPtr<LayoutNode> Element::create_layout_node(const StyleProperties* parent_sty | ||||||
|         return adopt(*new LayoutTableRow(*this, move(style))); |         return adopt(*new LayoutTableRow(*this, move(style))); | ||||||
|     if (display == "table-cell") |     if (display == "table-cell") | ||||||
|         return adopt(*new LayoutTableCell(*this, move(style))); |         return adopt(*new LayoutTableCell(*this, move(style))); | ||||||
|  |     if (display == "table-row-group") | ||||||
|  |         return adopt(*new LayoutTableRowGroup(*this, move(style))); | ||||||
|     if (display == "inline-block") { |     if (display == "inline-block") { | ||||||
|         auto inline_block = adopt(*new LayoutBlock(this, move(style))); |         auto inline_block = adopt(*new LayoutBlock(this, move(style))); | ||||||
|         inline_block->set_inline(true); |         inline_block->set_inline(true); | ||||||
|  |  | ||||||
|  | @ -65,6 +65,10 @@ public: | ||||||
| 
 | 
 | ||||||
|     virtual void split_into_lines(LayoutBlock& container, LayoutMode) override; |     virtual void split_into_lines(LayoutBlock& container, LayoutMode) override; | ||||||
| 
 | 
 | ||||||
|  | protected: | ||||||
|  |     void compute_width(); | ||||||
|  |     void compute_position(); | ||||||
|  |     void compute_height(); | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|     virtual bool is_block() const override { return true; } |     virtual bool is_block() const override { return true; } | ||||||
|  | @ -75,10 +79,6 @@ private: | ||||||
|     void layout_inline_children(LayoutMode); |     void layout_inline_children(LayoutMode); | ||||||
|     void layout_block_children(LayoutMode); |     void layout_block_children(LayoutMode); | ||||||
| 
 | 
 | ||||||
|     void compute_width(); |  | ||||||
|     void compute_position(); |  | ||||||
|     void compute_height(); |  | ||||||
| 
 |  | ||||||
|     Vector<LineBox> m_line_boxes; |     Vector<LineBox> m_line_boxes; | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -153,6 +153,7 @@ public: | ||||||
|     virtual bool is_table() const { return false; } |     virtual bool is_table() const { return false; } | ||||||
|     virtual bool is_table_row() const { return false; } |     virtual bool is_table_row() const { return false; } | ||||||
|     virtual bool is_table_cell() const { return false; } |     virtual bool is_table_cell() const { return false; } | ||||||
|  |     virtual bool is_table_row_group() const { return false; } | ||||||
|     bool has_style() const { return m_has_style; } |     bool has_style() const { return m_has_style; } | ||||||
| 
 | 
 | ||||||
|     bool is_inline() const { return m_inline; } |     bool is_inline() const { return m_inline; } | ||||||
|  |  | ||||||
							
								
								
									
										59
									
								
								Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,59 @@ | ||||||
|  | /*
 | ||||||
|  |  * Copyright (c) 2020, Andreas Kling <kling@serenityos.org> | ||||||
|  |  * All rights reserved. | ||||||
|  |  * | ||||||
|  |  * Redistribution and use in source and binary forms, with or without | ||||||
|  |  * modification, are permitted provided that the following conditions are met: | ||||||
|  |  * | ||||||
|  |  * 1. Redistributions of source code must retain the above copyright notice, this | ||||||
|  |  *    list of conditions and the following disclaimer. | ||||||
|  |  * | ||||||
|  |  * 2. Redistributions in binary form must reproduce the above copyright notice, | ||||||
|  |  *    this list of conditions and the following disclaimer in the documentation | ||||||
|  |  *    and/or other materials provided with the distribution. | ||||||
|  |  * | ||||||
|  |  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||||||
|  |  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||||||
|  |  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||||||
|  |  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||||||
|  |  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||||||
|  |  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||||||
|  |  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||||||
|  |  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||||||
|  |  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||||
|  |  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  |  */ | ||||||
|  | 
 | ||||||
|  | #include <LibWeb/DOM/Element.h> | ||||||
|  | #include <LibWeb/Layout/LayoutTableRowGroup.h> | ||||||
|  | #include <LibWeb/Layout/LayoutTableRow.h> | ||||||
|  | 
 | ||||||
|  | namespace Web { | ||||||
|  | 
 | ||||||
|  | LayoutTableRowGroup::LayoutTableRowGroup(const Element& element, NonnullRefPtr<StyleProperties> style) | ||||||
|  |     : LayoutBlock(&element, move(style)) | ||||||
|  | { | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | LayoutTableRowGroup::~LayoutTableRowGroup() | ||||||
|  | { | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | void LayoutTableRowGroup::layout(LayoutMode layout_mode) | ||||||
|  | { | ||||||
|  |     compute_width(); | ||||||
|  | 
 | ||||||
|  |     if (!is_inline()) | ||||||
|  |         compute_position(); | ||||||
|  | 
 | ||||||
|  |     float content_height = 0; | ||||||
|  | 
 | ||||||
|  |     for_each_child_of_type<LayoutTableRow>([&](auto& row) { | ||||||
|  |         row.layout(layout_mode); | ||||||
|  |         content_height += row.height(); | ||||||
|  |     }); | ||||||
|  | 
 | ||||||
|  |     rect().set_height(content_height); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | } | ||||||
							
								
								
									
										51
									
								
								Libraries/LibWeb/Layout/LayoutTableRowGroup.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								Libraries/LibWeb/Layout/LayoutTableRowGroup.h
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,51 @@ | ||||||
|  | /*
 | ||||||
|  |  * Copyright (c) 2020, Andreas Kling <kling@serenityos.org> | ||||||
|  |  * All rights reserved. | ||||||
|  |  * | ||||||
|  |  * Redistribution and use in source and binary forms, with or without | ||||||
|  |  * modification, are permitted provided that the following conditions are met: | ||||||
|  |  * | ||||||
|  |  * 1. Redistributions of source code must retain the above copyright notice, this | ||||||
|  |  *    list of conditions and the following disclaimer. | ||||||
|  |  * | ||||||
|  |  * 2. Redistributions in binary form must reproduce the above copyright notice, | ||||||
|  |  *    this list of conditions and the following disclaimer in the documentation | ||||||
|  |  *    and/or other materials provided with the distribution. | ||||||
|  |  * | ||||||
|  |  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||||||
|  |  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||||||
|  |  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||||||
|  |  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||||||
|  |  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||||||
|  |  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||||||
|  |  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||||||
|  |  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||||||
|  |  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||||
|  |  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  |  */ | ||||||
|  | 
 | ||||||
|  | #pragma once | ||||||
|  | 
 | ||||||
|  | #include <LibWeb/Layout/LayoutBlock.h> | ||||||
|  | 
 | ||||||
|  | namespace Web { | ||||||
|  | 
 | ||||||
|  | class LayoutTableRowGroup final : public LayoutBlock { | ||||||
|  | public: | ||||||
|  |     LayoutTableRowGroup(const Element&, NonnullRefPtr<StyleProperties>); | ||||||
|  |     virtual ~LayoutTableRowGroup() override; | ||||||
|  | 
 | ||||||
|  |     virtual void layout(LayoutMode = LayoutMode::Default) override; | ||||||
|  | 
 | ||||||
|  | private: | ||||||
|  |     virtual bool is_table_row_group() const override { return true; } | ||||||
|  |     virtual const char* class_name() const override { return "LayoutTableRowGroup"; } | ||||||
|  | }; | ||||||
|  | 
 | ||||||
|  | template<> | ||||||
|  | inline bool is<LayoutTableRowGroup>(const LayoutNode& node) | ||||||
|  | { | ||||||
|  |     return node.is_table_row_group(); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | } | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Andreas Kling
						Andreas Kling