TickLenght, LegendMarker and LegendWidth styles turned to Gfx::Length.

Author: simzer

src/chart/main/layout.cpp

@@ -21,7 +21,7 @@ void Layout::setBoundary(const Geom::Rect &boundary,
 	title = rect.popBottom(titlePos + titleHeight);
 	title.setBottom(titlePos);
 
-	auto legendWidth = *style.legend.width;
+	auto legendWidth = style.legend.width->get(rect.size.x);
 
 	auto legendPos = diagram.getOptions()->legend.get().combine<double>(
 	    [&](const auto &legend) { return legend ? 0 : -legendWidth; });

src/chart/main/style.cpp

@@ -134,7 +134,7 @@ Chart Chart::def()
 				.ticks = {
 					.color = Gfx::Color::Gray(0.8),
 					.lineWidth = 1,
-					.length = 5,
+					.length = Gfx::Length::Absolute(5),
 					.position = ::Anim::Interpolated<Tick::Position>
 						(Tick::Position::outside)
 				},
@@ -159,7 +159,7 @@ Chart Chart::def()
 				.borderColor = Gfx::Color(),
 				.borderWidth = 0,
 			},
-			.width = 100,
+			.width = Gfx::Length::Absolute(100),
 			.title = {
 				{
 					.paddingTop = Gfx::Length::Absolute(5),
@@ -207,7 +207,7 @@ Chart Chart::def()
 			.marker = {
 				.type = ::Anim::Interpolated<Legend::Marker::Type>
 					(Legend::Marker::Type::circle),
-				.size = 18
+				.size = Gfx::Length::Absolute(18)
 			}
 		},
 		.title = {

src/chart/main/style.h

@@ -133,7 +133,7 @@ struct Tick {
 
 	Param<Gfx::Color> color;
 	Param<double> lineWidth;
-	Param<double> length;
+	Param<Gfx::Length> length;
 	Param<::Anim::Interpolated<Position>> position;
 
 	void visit(auto &visitor)
@@ -239,7 +239,7 @@ struct Legend : Padding, Box
 		class Enum(Type)(circle, square);
 
 		Param<::Anim::Interpolated<Type>> type;
-		Param<double> size;
+		Param<Gfx::Length> size;
 
 		void visit(auto &visitor)
 		{
@@ -249,7 +249,7 @@ struct Legend : Padding, Box
 		}
 	};
 
-	Param<double> width;
+	Param<Gfx::Length> width;
 	Label title;
 	Label label;
 	Marker marker;

src/chart/rendering/drawinterlacing.cpp

@@ -194,8 +194,12 @@ void drawInterlacing::drawSticks(double stickIntensity,
 {
 	const auto &tickStyle = style.plot.axis.ticks;
 
+	auto tickLength = tickStyle.length->get(
+		coordSys.getRect().size.getCoord(horizontal)
+	);
+
 	if (tickStyle.color->isTransparent()
-		|| *tickStyle.length == 0
+		|| tickLength == 0
 		|| *tickStyle.lineWidth == 0)
 		return;
 
@@ -206,7 +210,7 @@ void drawInterlacing::drawSticks(double stickIntensity,
 
 	auto dP = horizontal ? Geom::Point::X(-1) : Geom::Point::Y(-1);
 	dP = coordSys.convertAt(stickPos, dP);
-	dP = dP.normalized() * *tickStyle.length;
+	dP = dP.normalized() * tickLength;
 
 	if (*tickStyle.lineWidth > 0)
 		canvas.setLineWidth(*tickStyle.lineWidth);

src/chart/rendering/drawlegend.cpp

@@ -76,17 +76,19 @@ Geom::Rect drawLegend::getItemRect(double index) const
 
 Geom::Rect drawLegend::getMarkerRect(const Geom::Rect &itemRect) const
 {
+	auto markerSize = style.marker.size->get(contentRect.size.y);
 	Geom::Rect res = itemRect;
-	res.pos.y += itemHeight / 2.0 - *style.marker.size / 2.0;
-	res.size = Geom::Size::Square(*style.marker.size);
+	res.pos.y += itemHeight / 2.0 - markerSize / 2.0;
+	res.size = Geom::Size::Square(markerSize);
 	return res;
 }
 
 Geom::Rect drawLegend::getLabelRect(const Geom::Rect &itemRect) const
 {
+	auto markerSize = style.marker.size->get(contentRect.size.y);
 	Geom::Rect res = itemRect;
-	res.pos.x += *style.marker.size;
-	res.size.x -= std::max(0.0, res.size.x - *style.marker.size);
+	res.pos.x += markerSize;
+	res.size.x -= std::max(0.0, res.size.x - markerSize);
 	return res;
 }
 
@@ -179,9 +181,10 @@ void drawLegend::sizeBar(const Geom::Rect &rect)
 
 Geom::Rect drawLegend::getBarRect() const
 {
+	auto markerSize = style.marker.size->get(contentRect.size.y);
 	Geom::Rect res = contentRect;
 	res.pos.y += titleHeight + itemHeight / 2.0;
 	res.size.y = 5 * itemHeight;
-	res.size.x = *style.marker.size;
+	res.size.x = markerSize;
 	return res;
 }