Font style inheritence added.

Author: simzer

src/chart/main/chart.cpp

@@ -31,6 +31,7 @@ Chart::Chart() :
 void Chart::setBoundRect(const Geom::Rect &rect, Gfx::ICanvas &info)
 {
 	if (actDiagram) {
+		actDiagram->getStyle().setup();
 		layout.setBoundary(rect, *actDiagram, info);
 	}
 }

src/chart/main/style.cpp

@@ -10,6 +10,13 @@ using namespace Vizzu::Styles;
 #pragma clang diagnostic ignored "-Wc99-designator"
 #endif
 
+Font Chart::defaultFont{
+	.fontFamily = ::Anim::String("Roboto, sans-serif"),
+	.fontStyle = Gfx::Font::Style::normal,
+	.fontWeight = Gfx::Font::Weight::Normal(),
+	.fontSize = Gfx::Length(16)
+};
+
 Chart Chart::def()
 {
 	return {
@@ -28,7 +35,7 @@ Chart Chart::def()
 			.fontFamily = ::Anim::String("Roboto, sans-serif"),
 			.fontStyle = Gfx::Font::Style::normal,
 			.fontWeight = Gfx::Font::Weight::Normal(),
-			.fontSize = 11
+			.fontSize = Gfx::Length::Relative(1)
 		},
 		.plot = {
 			{
@@ -62,10 +69,10 @@ Chart Chart::def()
 							.paddingLeft = Gfx::Length::Absolute(5)
 						},
 						{
-							.fontFamily = ::Anim::String("Roboto, sans-serif"),
+							.fontFamily = ::Anim::String(),
 							.fontStyle = Gfx::Font::Style::normal,
 							.fontWeight = Gfx::Font::Weight::Normal(),
-							.fontSize = 11
+							.fontSize = Gfx::Length::Relative(0.6875)
 						},
 						{
 							.color = Param<Gfx::Color>(),
@@ -93,10 +100,10 @@ Chart Chart::def()
 						.paddingLeft = Gfx::Length::Absolute(0)
 					},
 					{
-						.fontFamily = ::Anim::String("Roboto, sans-serif"),
+						.fontFamily = ::Anim::String(),
 						.fontStyle = Gfx::Font::Style::normal,
 						.fontWeight = Gfx::Font::Weight::Normal(),
-						.fontSize = 14
+						.fontSize = Gfx::Length::Relative(0.875)
 					},
 					{
 						.color = Gfx::Color::Gray(0.6),
@@ -116,10 +123,10 @@ Chart Chart::def()
 						.paddingLeft = Gfx::Length::Absolute(25)
 					},
 					{
-						.fontFamily = ::Anim::String("Roboto, sans-serif"),
+						.fontFamily = ::Anim::String(),
 						.fontStyle = Gfx::Font::Style::normal,
 						.fontWeight = Gfx::Font::Weight::Normal(),
-						.fontSize = 12
+						.fontSize = Gfx::Length::Relative(0.75)
 					},
 					{
 						.color = Gfx::Color::RGB(0xababab),
@@ -168,10 +175,10 @@ Chart Chart::def()
 					.paddingLeft = Gfx::Length::Absolute(5)
 				},
 				{
-					.fontFamily = ::Anim::String("Roboto, sans-serif"),
+					.fontFamily = ::Anim::String(),
 					.fontStyle = Gfx::Font::Style::normal,
 					.fontWeight = Gfx::Font::Weight::Normal(),
-					.fontSize = 14
+					.fontSize = Gfx::Length::Relative(0.875)
 				},
 				{
 					.color = Gfx::Color::Gray(0.77),
@@ -190,10 +197,10 @@ Chart Chart::def()
 					.paddingLeft = Gfx::Length::Absolute(10)
 				},
 				{
-					.fontFamily = ::Anim::String("Roboto, sans-serif"),
+					.fontFamily = ::Anim::String(),
 					.fontStyle = Gfx::Font::Style::normal,
 					.fontWeight = Gfx::Font::Weight::Normal(),
-					.fontSize = 14
+					.fontSize = Gfx::Length::Relative(0.875)
 				},
 				{
 					.color = Gfx::Color::Gray(0.45),
@@ -218,10 +225,10 @@ Chart Chart::def()
 				.paddingLeft = Gfx::Length::Absolute(10)
 			},
 			{
-				.fontFamily = ::Anim::String("Roboto, sans-serif"),
+				.fontFamily = ::Anim::String(),
 				.fontStyle = Gfx::Font::Style::normal,
 				.fontWeight = Gfx::Font::Weight::Normal(),
-				.fontSize = 26
+				.fontSize = Gfx::Length::Relative(1.625)
 			},
 			{
 				.color = Gfx::Color::RGB(0x494949),

src/chart/main/style.h

@@ -63,12 +63,38 @@ struct Font {
 	Param<::Anim::String> fontFamily;
 	Param<Gfx::Font::Style> fontStyle;
 	Param<Gfx::Font::Weight> fontWeight;
-	Param<double> fontSize;
+	Param<Gfx::Length> fontSize;
+	const Font *fontParent = nullptr;
+
+	double calculatedSize() const 
+	{
+		if (fontSize.has_value() && fontSize->isAbsolute()) 
+			return fontSize->get();
+		
+		if (fontSize.has_value() && fontParent) 
+			return fontSize->get(fontParent->calculatedSize());
+		
+		if (fontParent)
+			return fontParent->calculatedSize();
+
+		throw std::logic_error("internal error: no font parent set");
+	}
+
+	std::string calculatedFamily() const 
+	{
+		if (fontFamily.has_value() && !fontFamily->values[0].value.empty())
+			return fontFamily->values[0].value;
+		
+		if (fontParent) 
+			return fontParent->calculatedFamily();
+		
+		throw std::logic_error("internal error: no font parent set");
+	}
 
 	explicit operator Gfx::Font() const
 	{
-		return Gfx::Font(fontFamily->values[0].value,
-			*fontStyle, *fontWeight, *fontSize);
+		return Gfx::Font(calculatedFamily(),
+			*fontStyle, *fontWeight, calculatedSize());
 	}
 
 	void visit(auto &visitor)
@@ -358,7 +384,22 @@ struct Chart : Padding, Box, Font
 			(data, "data");
 	}
 
+	static Font defaultFont;
 	static Chart def();
+
+	void setup() 
+	{
+		std::vector<Font*> fonts{
+			&title,
+			&plot.axis.title,
+			&plot.axis.label,
+			&plot.marker.label,
+			&legend.title,
+			&legend.label
+		};
+		fontParent = &defaultFont;
+		for (auto font : fonts) font->fontParent = (Font*)this;
+	}
 };
 
 }