Move computed values to own file

Build/cmake/FileList.cmake

@@ -67,6 +67,7 @@ set(Core_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/PropertyParserString.h
     ${PROJECT_SOURCE_DIR}/Source/Core/PropertyParserTransform.h
     ${PROJECT_SOURCE_DIR}/Source/Core/PropertyShorthandDefinition.h
+    ${PROJECT_SOURCE_DIR}/Source/Core/RCSS.h
     ${PROJECT_SOURCE_DIR}/Source/Core/StreamFile.h
     ${PROJECT_SOURCE_DIR}/Source/Core/StringCache.h
     ${PROJECT_SOURCE_DIR}/Source/Core/StyleSheetFactory.h

Source/Core/Element.cpp

@@ -44,6 +44,7 @@
 #include "LayoutEngine.h"
 #include "PluginRegistry.h"
 #include "Pool.h"
+#include "RCSS.h"
 #include "StyleSheetParser.h"
 #include "XMLParseTools.h"
 #include "../../Include/Rocket/Core/Core.h"
@@ -93,6 +94,7 @@ struct ElementMeta
 	ElementBorder border;
 	ElementDecoration decoration;
 	ElementScroll scroll;
+	RCSS::ComputedValues computed_values;
 
 	void* ElementMeta::operator new(size_t size)
 	{

Source/Core/RCSS.h

@@ -0,0 +1,160 @@
+/*
+ * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ *
+ * For the latest information, see http://www.librocket.com
+ *
+ * Copyright (c) 2019 Michael R. P. Ragazzon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#ifndef ROCKETCORERCSS_H
+#define ROCKETCORERCSS_H
+
+namespace Rocket {
+namespace Core {
+
+#include "../../Include/Rocket/Core/Types.h"
+
+namespace RCSS
+{
+struct LengthPercentageAuto {
+	enum Type { Length, Percentage, Auto } type = Length;
+	float value = 0;
+	LengthPercentageAuto() {}
+	LengthPercentageAuto(Type type, float value = 0) : type(type), value(value) {}
+};
+struct LengthPercentage {
+	enum Type { Length, Percentage } type = Length;
+	float value = 0;
+};
+
+struct NumberAuto {
+	enum Type { Number, Auto } type = Number;
+	float value = 0;
+	NumberAuto() {}
+	NumberAuto(Type type, float value = 0) : type(type), value(value) {}
+};
+
+enum class Display { None, Block, Inline, InlineBlock };
+enum class Position { Static, Relative, Absolute, Fixed };
+
+enum class Float { None, Left, Right };
+enum class Clear { None, Left, Right, Both };
+
+struct VerticalAlign {
+	enum Type { Baseline, Middle, Sub, Super, TextTop, TextBottom, Top, Bottom, Length } type = Baseline;
+	float value = 0; // For length type
+};
+
+
+enum class Overflow { Visible, Hidden, Auto, Scroll };
+
+struct Clip {
+	enum Type { Auto, Number, None } type = Auto;
+	float value = 0;
+};
+
+enum class Visibility { Visible, Hidden };
+
+enum class FontStyle { Normal, Italic };
+enum class FontWeight { Normal, Bold };
+
+enum class TextAlign { Left, Right, Center, Justify };
+enum class TextDecoration { None, Underline };
+enum class TextTransform { None, Capitalize, Uppercase, Lowercase };
+enum class WhiteSpace { Normal, Pre, Nowrap, Prewrap, Preline };
+
+enum class Drag { None, Drag, DragDrop, Block, Clone };
+enum class TabIndex { None, Auto };
+enum class Focus { None, Auto };
+enum class PointerEvents { None, Auto };
+
+
+struct ComputedValues
+{
+	LengthPercentageAuto margin_top, margin_right, margin_bottom, margin_left;
+	LengthPercentage padding_top, padding_right, padding_bottom, padding_left;
+	float border_top_width = 0, border_right_width = 0, border_bottom_width = 0, border_left_width = 0;
+	Colourb border_top_color{ 255, 255, 255 }, border_right_color{ 255, 255, 255 }, border_bottom_color{ 255, 255, 255 }, border_left_color{ 255, 255, 255 };
+
+	Display display = Display::Inline;
+	Position position = Position::Static;
+
+	LengthPercentageAuto top{ LengthPercentageAuto::Auto }, right{ LengthPercentageAuto::Auto }, bottom{ LengthPercentageAuto::Auto }, left{ LengthPercentageAuto::Auto };
+
+	Float _float = Float::None;
+	Clear clear = Clear::None;
+
+	NumberAuto z_index = { NumberAuto::Auto };
+
+	LengthPercentageAuto width = { LengthPercentageAuto::Auto };
+	LengthPercentage min_width, max_width;
+	LengthPercentageAuto height = { LengthPercentageAuto::Auto };
+	LengthPercentage min_height, max_height;
+
+	float line_height = 1.2f;
+	VerticalAlign vertical_align;
+
+	Overflow overflow_x = Overflow::Visible, overflow_y = Overflow::Visible;
+	Clip clip;
+
+	Visibility visibility = Visibility::Visible;
+
+	Colourb background_color = Colourb(255, 255, 255, 0);
+	Colourb color = Colourb(255, 255, 255);
+	Colourb image_color = Colourb(255, 255, 255);
+	float opacity = 1;
+
+	String font_family;
+	String font_charset; // empty is same as "U+0020-007E"
+	FontStyle font_style = FontStyle::Normal;
+	FontWeight font_weight = FontWeight::Normal;
+	LengthPercentage font_size;
+
+	TextAlign text_align = TextAlign::Left;
+	TextDecoration text_decoration = TextDecoration::None;
+	TextTransform text_transform = TextTransform::None;
+	WhiteSpace white_space = WhiteSpace::Normal;
+
+	String cursor;
+
+	Drag drag = Drag::None;
+	TabIndex tab_index = TabIndex::None;
+	Focus focus = Focus::Auto;
+	float scrollbar_margin = 0;
+	PointerEvents pointer_events = PointerEvents::Auto;
+
+	float perspective = 0;
+	float perspective_origin_x = 0.5f, perspective_origin_y = 0.5f; // Relative
+
+	String transform;
+	float transform_origin_x = 0.5f, transform_origin_y = 0.5f, transform_origin_z = 0.f;
+
+	String transition; // empty is same as "none"
+	String animation;  // empty is same as "none"
+};
+}
+
+
+}
+}
+
+#endif

Source/Core/StyleSheetSpecification.cpp

@@ -155,126 +155,6 @@ void StyleSheetSpecification::RegisterDefaultParsers()
 }
 
 
-namespace RCSS 
-{
-	struct LengthPercentageAuto {
-		enum Type { Length, Percentage, Auto } type = Length;
-		float value = 0;
-		LengthPercentageAuto() {}
-		LengthPercentageAuto(Type type, float value = 0) : type(type), value(value) {}
-	};
-	struct LengthPercentage {
-		enum Type { Length, Percentage } type = Length;
-		float value = 0;
-	};
-
-	struct NumberAuto {
-		enum Type { Number, Auto } type = Number;
-		float value = 0;
-		NumberAuto() {}
-		NumberAuto(Type type, float value = 0) : type(type), value(value) {}
-	};
-
-	enum class Display { None, Block, Inline, InlineBlock };
-	enum class Position { Static, Relative, Absolute, Fixed };
-
-	enum class Float { None, Left, Right };
-	enum class Clear { None, Left, Right, Both };
-
-	struct VerticalAlign {
-		enum Type { Baseline, Middle, Sub, Super, TextTop, TextBottom, Top, Bottom, Length } type = Baseline;
-		float value = 0; // For length type
-	};
-
-
-	enum class Overflow { Visible, Hidden, Auto, Scroll };
-
-	struct Clip {
-		enum Type { Auto, Number, None } type = Auto;
-		float value;
-	};
-
-	enum class Visibility { Visible, Hidden };
-
-	enum class FontStyle { Normal, Italic };
-	enum class FontWeight { Normal, Bold };
-
-	enum class TextAlign { Left, Right, Center, Justify };
-	enum class TextDecoration { None, Underline };
-	enum class TextTransform { None, Capitalize, Uppercase, Lowercase };
-	enum class WhiteSpace { Normal, Pre, Nowrap, Prewrap, Preline };
-
-	enum class Drag { None, Drag, DragDrop, Block, Clone };
-	enum class TabIndex { None, Auto };
-	enum class Focus { None, Auto };
-	enum class PointerEvents { None, Auto };
-
-
-	struct ComputedValues 
-	{
-		LengthPercentageAuto margin_top, margin_right, margin_bottom, margin_left;
-		LengthPercentage padding_top, padding_right, padding_bottom, padding_left;
-		float border_top_width = 0, border_right_width = 0, border_bottom_width = 0, border_left_width = 0;
-		Colourb border_top_color{ 255, 255, 255 }, border_right_color{ 255, 255, 255 }, border_bottom_color{ 255, 255, 255 }, border_left_color{ 255, 255, 255 };
-
-		Display display = Display::Inline;
-		Position position = Position::Static;
-
-		LengthPercentageAuto top{ LengthPercentageAuto::Auto }, right{ LengthPercentageAuto::Auto }, bottom{ LengthPercentageAuto::Auto }, left{ LengthPercentageAuto::Auto };
-
-		Float _float = Float::None;
-		Clear clear = Clear::None;
-
-		NumberAuto z_index = { NumberAuto::Auto };
-
-		LengthPercentageAuto width = { LengthPercentageAuto::Auto };
-		LengthPercentage min_width, max_width;
-		LengthPercentageAuto height = { LengthPercentageAuto::Auto };
-		LengthPercentage min_height, max_height;
-	
-		float line_height = 1.2f;
-		VerticalAlign vertical_align;
-	
-		Overflow overflow_x = Overflow::Visible, overflow_y = Overflow::Visible;
-		Clip clip;
-
-		Visibility visibility = Visibility::Visible;
-
-		Colourb background_color = Colourb(255, 255, 255, 0);
-		Colourb color = Colourb(255, 255, 255);
-		Colourb image_color = Colourb(255, 255, 255);
-		float opacity = 1;
-
-		String font_family;
-		String font_charset; // empty is same as "U+0020-007E"
-		FontStyle font_style = FontStyle::Normal;
-		FontWeight font_weight = FontWeight::Normal;
-		LengthPercentage font_size;
-
-		TextAlign text_align = TextAlign::Left;
-		TextDecoration text_decoration = TextDecoration::None;
-		TextTransform text_transform = TextTransform::None;
-		WhiteSpace white_space = WhiteSpace::Normal;
-
-		String cursor;
-
-		Drag drag = Drag::None;
-		TabIndex tab_index = TabIndex::None;
-		Focus focus = Focus::Auto;
-		float scrollbar_margin = 0;
-		PointerEvents pointer_events = PointerEvents::Auto;
-
-		float perspective = 0;
-		float perspective_origin_x = 0.5f, perspective_origin_y = 0.5f; // Relative
-
-		String transform;
-		float transform_origin_x = 0.5f, transform_origin_y = 0.5f, transform_origin_z = 0.f;
-
-		String transition; // empty is same as "none"
-		String animation;  // empty is same as "none"
-	};
-}
-
 // Registers Rocket's default style properties.
 void StyleSheetSpecification::RegisterDefaultProperties()
 {