Fix fontparent setter bug

Author: schaumb

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Split chart count negative values too.
 - Split chart handled when same dimension on main and sub axis.
 - Add record didn't handle when a measure got an empty string.
+- Fix no fontparent set bug.
 
 ### Changed
 

src/chart/animator/keyframe.cpp

@@ -71,6 +71,7 @@ void Keyframe::prepareActual()
 	prepareActualMarkersInfo();
 
 	actual = std::make_shared<Gen::Plot>(*source);
+	actual->getStyle().setup();
 	actual->detachOptions();
 }
 
@@ -92,6 +93,7 @@ void Keyframe::copyTarget()
 	if (!targetCopy) {
 		targetCopy = target;
 		target = std::make_shared<Gen::Plot>(*targetCopy);
+		target->getStyle().setup();
 		target->detachOptions();
 	}
 }

src/chart/generator/plot.cpp

@@ -58,7 +58,9 @@ Plot::Plot(PlotOptionsPtr opts, Styles::Chart style) :
     guides(*opts),
     options(std::move(opts)),
     style(std::move(style))
-{}
+{
+	this->style.setup();
+}
 
 void Plot::detachOptions()
 {

src/chart/main/chart.cpp

@@ -29,6 +29,7 @@ Chart::Chart() :
         *events.animation.begin,
         *events.animation.complete)
 {
+	computedStyles.setup();
 	animator.onDraw.attach(
 	    [this](const Gen::PlotPtr &actPlot)
 	    {
@@ -72,8 +73,9 @@ void Chart::animate(Anim::Animation::OnComplete &&onComplete)
 		    }
 		    else {
 			    *nextOptions = prevOptions;
-			    actStyles = prevStyles;
+			    setStyles(prevStyles);
 			    computedStyles = plot->getStyle();
+			    computedStyles.setup();
 		    }
 	    });
 
@@ -132,6 +134,7 @@ Gen::PlotPtr Chart::plot(const Gen::PlotOptionsPtr &options)
 	Styles::Sheet::setAfterStyles(*res, layout.boundary.size);
 
 	computedStyles = res->getStyle();
+	computedStyles.setup();
 
 	return res;
 }

src/chart/main/style.cpp

@@ -584,7 +584,7 @@ struct FontParentSetter
 	{}
 };
 
-void Chart::setup()
+void Chart::setup() &
 {
 	Refl::visit(FontParentSetter{this}, *this);
 	fontParent = &getDefaultFont();

src/chart/main/style.h

@@ -401,7 +401,7 @@ struct Chart : Padding, Box, Font, ChartParams
 	static const Gfx::ColorPalette &getDefaultColorPalette();
 	static Chart def();
 
-	void setup();
+	void setup() &;
 };
 
 }

src/chart/main/stylesheet.cpp

@@ -51,6 +51,7 @@ Chart Sheet::getFullParams(const Gen::PlotOptionsPtr &options,
 void Sheet::calcDefaults(const Geom::Size &size)
 {
 	defaultParams = Chart::def();
+	defaultParams.setup();
 
 	defaultParams.fontSize = Gfx::Length{baseFontSize(size, true)};
 
@@ -219,7 +220,6 @@ void Sheet::setData()
 void Sheet::setAfterStyles(Gen::Plot &plot, const Geom::Size &size)
 {
 	auto &style = plot.getStyle();
-	style.setup();
 
 	if (auto &xLabel =
 	        style.plot

src/chart/main/stylesheet.h

@@ -27,7 +27,12 @@ class Sheet : public Style::Sheet<Chart>
 {
 public:
 	using Base = Style::Sheet<Chart>;
-	using Base::Sheet;
+
+	Sheet(Chart &&defaultParams, Chart &activeParams) :
+	    Base(std::move(defaultParams), activeParams)
+	{
+		this->defaultParams.setup();
+	}
 
 	Chart getFullParams(const Gen::PlotOptionsPtr &options,
 	    const Geom::Size &size);