Add scrollTop/scrollHeight + some review

schaumb · schaumb · commit 5e56526bcc1b · 2024-09-01T08:13:44.000+02:00
diff --git a/src/apps/weblib/ts-api/events.ts b/src/apps/weblib/ts-api/events.ts
@@ -124,8 +124,8 @@ export interface Caption extends TextElement {
 export interface Legend extends Element {
 	tagName: 'legend'
 	channel: string
-	/** Marker labels y overflow by pixel */
-	yOverflow: number
+	scrollTop: number
+	scrollHeight: number
 }
 
 /** Logo element of the chart. */
diff --git a/src/base/conv/auto_json.h b/src/base/conv/auto_json.h
@@ -325,6 +325,25 @@ struct JSONObj : protected JSONRepeat<'{', '}'>
 		}
 		return std::move(*this);
 	}
+
+	template <class T> JSONObj &&mergeObj(T &&obj) &&
+	{
+		if (was) json.pop_back();
+		auto pre_size = json.size();
+
+		staticObj(obj);
+
+		json.pop_back();
+
+		if (pre_size + 1 == json.size())
+			json.pop_back();
+		else if (was)
+			json[pre_size] = ',';
+		else
+			was = true;
+
+		return std::move(*this);
+	}
 };
 
 struct JSONArr : protected JSONRepeat<'[', ']'>
diff --git a/src/chart/main/events.h b/src/chart/main/events.h
@@ -205,22 +205,29 @@ class Events
 			}
 		};
 
+		struct LegendProperties
+		{
+			double scrollTop;
+			double scrollHeight;
+		};
+
 		struct Legend : Element
 		{
 			Gen::ChannelId channel;
-			double yOverflow;
+			LegendProperties properties;
 
 			explicit Legend(Gen::ChannelId channel,
-			    double yOverflow) :
+			    const LegendProperties &properties) :
 			    Element("legend"),
 			    channel(channel),
-			    yOverflow(yOverflow)
+			    properties(properties)
 			{}
 
 			void appendToJSON(Conv::JSONObj &&jsonObj) const override
 			{
-				Element::appendToJSON(std::move(jsonObj)("channel",
-				    channel)("yOverflow", yOverflow));
+				Element::appendToJSON(
+				    std::move(jsonObj)("channel", channel)
+				        .mergeObj(properties));
 			}
 		};
 
@@ -304,9 +311,10 @@ class Events
 			return std::make_unique<Axis>(horizontal);
 		}
 
-		static auto legend(Gen::ChannelId channel, double yOverflow)
+		static auto legend(Gen::ChannelId channel,
+		    const LegendProperties &properties)
 		{
-			return std::make_unique<Legend>(channel, yOverflow);
+			return std::make_unique<Legend>(channel, properties);
 		}
 
 		static auto marker(const Gen::Marker &marker)
@@ -370,56 +378,56 @@ class Events
 		    const std::string_view &categoryValue,
 		    const std::string &label,
 		    Gen::ChannelId channel,
-		    double yOverflow)
+		    const LegendProperties &properties)
 		{
 			return std::make_unique<CategoryInfo<Text<LegendChild>>>(
 			    categoryName,
 			    categoryValue,
 			    label,
 			    "label",
 			    channel,
-			    yOverflow);
+			    properties);
 		}
 
 		static auto measLegendLabel(const std::string &label,
 		    Gen::ChannelId channel,
-		    double yOverflow)
+		    const LegendProperties &properties)
 		{
 			return std::make_unique<Text<LegendChild>>(label,
 			    "label",
 			    channel,
-			    yOverflow);
+			    properties);
 		}
 
 		static auto legendTitle(const std::string &title,
 		    Gen::ChannelId channel,
-		    double yOverflow)
+		    const LegendProperties &properties)
 		{
 			return std::make_unique<Text<LegendChild>>(title,
 			    "title",
 			    channel,
-			    yOverflow);
+			    properties);
 		}
 
 		static auto legendMarker(const std::string_view &categoryName,
 		    const std::string_view &categoryValue,
 		    Gen::ChannelId channel,
-		    double yOverflow)
+		    const LegendProperties &properties)
 		{
 			return std::make_unique<CategoryInfo<LegendChild>>(
 			    categoryName,
 			    categoryValue,
 			    "marker",
 			    channel,
-			    yOverflow);
+			    properties);
 		}
 
 		static auto legendBar(Gen::ChannelId channel,
-		    double yOverflow)
+		    const LegendProperties &properties)
 		{
 			return std::make_unique<LegendChild>("bar",
 			    channel,
-			    yOverflow);
+			    properties);
 		}
 
 		static auto dimAxisLabel(const std::string_view &categoryName,
diff --git a/src/chart/rendering/drawlegend.cpp b/src/chart/rendering/drawlegend.cpp
@@ -53,8 +53,6 @@ void DrawLegend::draw(Gfx::ICanvas &canvas,
 	    .titleRect = titleRect,
 	    .markerWindowRect = markerWindowRect,
 	    .fadeHeight = fadeHeight,
-	    .yOverflow = {},
-	    .yOffset = {},
 	    .type = channelType,
 	    .weight = weight,
 	    .itemHeight = itemHeight,
@@ -64,23 +62,23 @@ void DrawLegend::draw(Gfx::ICanvas &canvas,
 	    .colorGradientSetter = {markerWindowRect.leftSide(),
 	        Gfx::ColorGradient{{
 	            {0.0, {}},
-	            {fadeElementPercent / 2.0, {}},
 	            {fadeElementPercent, {}},
 	            {1.0 - fadeElementPercent, {}},
-	            {1.0 - fadeElementPercent / 2.0, {}},
 	            {1.0, {}},
 	        }}}};
 
-	info.yOverflow = markersLegendFullSize(info) - markerWindowHeight;
-	if (std::signbit(info.yOverflow)) info.yOverflow = 0.0;
-	info.yOffset =
-	    style.translateY->get(info.yOverflow, info.itemHeight);
+	info.properties.scrollHeight = markersLegendFullSize(info);
+	auto yOverflow =
+	    info.properties.scrollHeight - markerWindowHeight;
+	if (std::signbit(yOverflow)) yOverflow = 0.0;
+	info.properties.scrollTop =
+	    style.translateY->get(yOverflow, info.itemHeight);
 
 	DrawBackground{{ctx()}}.draw(canvas,
 	    legendLayout,
 	    style,
 	    *events.background,
-	    Events::Targets::legend(channelType, info.yOverflow));
+	    Events::Targets::legend(channelType, info.properties));
 
 	canvas.save();
 
@@ -108,13 +106,9 @@ void DrawLegend::ColorGradientSetter::operator()(Gfx::ICanvas &canvas,
 	for (auto &stop : modifiableStops) stop.value = color;
 
 	modifiableStops[0].value.alpha = 0.0;
-	modifiableStops[1].value.alpha *= 0.27;
-	modifiableStops[4].value.alpha *= 0.27;
 	modifiableStops[5].value.alpha = 0.0;
 
-	canvas.setBrushGradient(
-	    {transform(line.begin), transform(line.end)},
-	    gradient);
+	canvas.setBrushGradient(transform(line), gradient);
 }
 
 void DrawLegend::drawTitle(const Info &info) const
@@ -136,7 +130,7 @@ void DrawLegend::drawTitle(const Info &info) const
 		        *events.title,
 		        Events::Targets::legendTitle(title.value,
 		            info.type,
-		            info.yOverflow),
+		            info.properties),
 		        {.alpha = title.weight * info.weight * mul});
 	    });
 }
@@ -187,7 +181,7 @@ void DrawLegend::drawDimension(const Info &info) const
 			            value.second.categoryValue,
 			            value.second.categoryValue,
 			            info.type,
-			            info.yOverflow),
+			            info.properties),
 			        {.alpha =
 			                double{
 			                    alpha
@@ -204,8 +198,8 @@ void DrawLegend::drawDimension(const Info &info) const
 Geom::Rect DrawLegend::getItemRect(const Info &info, double index)
 {
 	Geom::Rect res = info.markerWindowRect;
-	res.pos.y +=
-	    info.fadeHeight + index * info.itemHeight - info.yOffset;
+	res.pos.y += info.fadeHeight + index * info.itemHeight
+	           - info.properties.scrollTop;
 	res.size.y = info.itemHeight;
 	if (std::signbit(res.size.x)) res.size.x = 0;
 	return res;
@@ -254,7 +248,7 @@ void DrawLegend::drawMarker(const Info &info,
 	    Events::Targets::legendMarker(info.dimension.category,
 	        categoryValue,
 	        info.type,
-	        info.yOverflow);
+	        info.properties);
 
 	if (events.marker->invoke(
 	        Events::OnRectDrawEvent(*markerElement, {rect, false}))) {
@@ -315,7 +309,7 @@ void DrawLegend::extremaLabel(const Info &info,
 	    *events.label,
 	    Events::Targets::measLegendLabel(text,
 	        info.type,
-	        info.yOverflow),
+	        info.properties),
 	    {.alpha = info.measureWeight * plusWeight});
 }
 
@@ -354,7 +348,7 @@ void DrawLegend::colorBar(const Info &info,
 
 	auto barElement =
 	    Events::Targets::legendBar(Gen::ChannelId::color,
-	        info.yOverflow);
+	        info.properties);
 
 	if (events.bar->invoke(
 	        Events::OnRectDrawEvent(*barElement, {rect, false}))) {
@@ -387,7 +381,7 @@ void DrawLegend::lightnessBar(const Info &info,
 
 	auto barElement =
 	    Events::Targets::legendBar(Gen::ChannelId::lightness,
-	        info.yOverflow);
+	        info.properties);
 
 	if (events.bar->invoke(
 	        Events::OnRectDrawEvent(*barElement, {rect, false}))) {
@@ -409,7 +403,7 @@ void DrawLegend::sizeBar(const Info &info,
 	info.canvas.setLineWidth(0);
 
 	auto barElement = Events::Targets::legendBar(Gen::ChannelId::size,
-	    info.yOverflow);
+	    info.properties);
 
 	if (events.bar->invoke(
 	        Events::OnRectDrawEvent(*barElement, {rect, false}))) {
diff --git a/src/chart/rendering/drawlegend.h b/src/chart/rendering/drawlegend.h
@@ -42,8 +42,6 @@ class DrawLegend : public DrawingContext
 		Geom::Rect titleRect;
 		Geom::Rect markerWindowRect;
 		double fadeHeight{};
-		double yOverflow{};
-		double yOffset{};
 		Gen::ChannelId type{};
 		double weight{};
 		double itemHeight{};
@@ -53,6 +51,7 @@ class DrawLegend : public DrawingContext
 		double measureEnabled = measure.enabled.calculate<double>();
 		bool dimensionEnabled = dimension.enabled;
 		double measureWeight = weight * measureEnabled;
+		Events::Targets::LegendProperties properties{};
 		ColorGradientSetter colorGradientSetter;
 	};
 
