Review

Author: schaumb

CHANGELOG.md

@@ -6,7 +6,6 @@
 
 - Legend title bottomPadding extended.
 - ColorGradient fromString not increasing position prohibited.
-- Remove background settings for all text, including title, subtitle and caption.
 - Fix alpha settings to linear by default:
   - Axis: line, title, labels, guides, interlacing, ticks
   - Legend: title, dimension markers, measure extrema labels
@@ -15,6 +14,7 @@
 ### Added
 
 - New style parameter for the legend scrolling.
+- Remove background settings for all text, including title, subtitle and caption.
 
 ## [0.12.1] - 2024-08-22
 

src/base/gfx/colortransform.cpp

@@ -65,21 +65,12 @@ ColorTransform ColorTransform::Lightness(double factor)
 }
 
 ColorTransform ColorTransform::Opacity(double factor)
-{
-	return {[=](const Color &color)
-	    {
-		    return color.transparent(factor);
-	    },
-	    "opacity(" + std::to_string(factor) + ")"};
-}
-
-ColorTransform ColorTransform::Fade(double factor)
 {
 	return {[=](const Color &color)
 	    {
 		    return color * factor;
 	    },
-	    "fade(" + std::to_string(factor) + ")"};
+	    "opacity(" + std::to_string(factor) + ")"};
 }
 
 ColorTransform ColorTransform::None()

src/base/gfx/colortransform.h

@@ -19,7 +19,6 @@ class ColorTransform
 	static ColorTransform Grayscale(double factor);
 	static ColorTransform Lightness(double factor);
 	static ColorTransform Opacity(double factor);
-	static ColorTransform Fade(double factor);
 	static ColorTransform None();
 
 	Color operator()(const Color &color) const;

src/base/math/fuzzybool.h

@@ -124,7 +124,7 @@ class FuzzyBool
 		return FuzzyBool(std::max(0.0, 1 - 2 * value));
 	}
 
-	[[nodiscard]] FuzzyBool lessAndMore() const
+	[[nodiscard]] FuzzyBool moreOrLess() const
 	{
 		return FuzzyBool(std::abs(2 * value - 1));
 	}

src/chart/rendering/drawaxes.cpp

@@ -253,7 +253,7 @@ void DrawAxes::drawTitle(Gen::ChannelId axisIndex) const
 		    *rootEvents.draw.plot.axis.title,
 		    Events::Targets::axisTitle(title.value,
 		        axisIndex == Gen::ChannelId::x),
-		    {.colorTransform = Gfx::ColorTransform::Fade(weight),
+		    {.colorTransform = Gfx::ColorTransform::Opacity(weight),
 		        .flip = upsideDown});
 
 		canvas.restore();
@@ -354,7 +354,7 @@ void DrawAxes::drawDimensionLabel(bool horizontal,
 			        posDir,
 			        labelStyle,
 			        0,
-			        Gfx::ColorTransform::Fade(
+			        Gfx::ColorTransform::Opacity(
 			            Math::FuzzyBool::And(weight,
 			                str.weight,
 			                plusWeight)),

src/chart/rendering/drawchart.cpp

@@ -75,9 +75,10 @@ void DrawChart::drawHeading(Gfx::ICanvas &canvas,
 			            style,
 			            event,
 			            targetGetter(*weighted.value),
-			            {.colorTransform = Gfx::ColorTransform::Fade(
-			                 Math::FuzzyBool::more(
-			                     weighted.weight))});
+			            {.colorTransform =
+			                    Gfx::ColorTransform::Opacity(
+			                        Math::FuzzyBool::more(
+			                            weighted.weight))});
 		        }
 	        });
 }

src/chart/rendering/drawinterlacing.cpp

@@ -288,7 +288,7 @@ void DrawInterlacing::drawDataLabel(
 		    posDir,
 		    labelStyle,
 		    0,
-		    Gfx::ColorTransform::Fade(Math::FuzzyBool::And(alpha,
+		    Gfx::ColorTransform::Opacity(Math::FuzzyBool::And(alpha,
 		        position.weight,
 		        wUnit.weight)),
 		    *rootEvents.draw.plot.axis.label,

src/chart/rendering/drawlegend.cpp

@@ -136,7 +136,7 @@ void DrawLegend::drawTitle(const Info &info) const
 		            *events.title,
 		            Events::Targets::legendTitle(title.value,
 		                info.properties),
-		            {.colorTransform = Gfx::ColorTransform::Fade(
+		            {.colorTransform = Gfx::ColorTransform::Opacity(
 		                 Math::FuzzyBool::And(title.weight,
 		                     info.weight,
 		                     mul))});
@@ -188,7 +188,7 @@ void DrawLegend::drawDimension(Info &info) const
 			            value.second.categoryValue,
 			            value.second.categoryValue,
 			            info.properties),
-			        {.colorTransform = Gfx::ColorTransform::Fade(
+			        {.colorTransform = Gfx::ColorTransform::Opacity(
 			             Math::FuzzyBool::And(alpha,
 			                 weighted.weight)),
 			            .gradient = needGradient
@@ -311,7 +311,7 @@ void DrawLegend::extremaLabel(const Info &info,
 	    style.label,
 	    *events.label,
 	    Events::Targets::measLegendLabel(text, info.properties),
-	    {.colorTransform = Gfx::ColorTransform::Fade(
+	    {.colorTransform = Gfx::ColorTransform::Opacity(
 	         Math::FuzzyBool::And(info.measureWeight, plusWeight))});
 }
 

src/chart/rendering/markers/connectingmarker.cpp

@@ -80,8 +80,7 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 		    std::max(minWidth, maxWidth * marker.sizeFactor, less);
 
 		auto horizontalFactor =
-		    isArea ? static_cast<double>(horizontal.lessAndMore())
-		           : 1;
+		    isArea ? static_cast<double>(horizontal.moreOrLess()) : 1;
 
 		points[2] = pos;
 		points[1] = pos