Fix weekend bugs

schaumb · schaumb · commit 28d303e286bf · 2024-09-02T10:21:31.000+02:00
diff --git a/src/base/conv/auto_json.h b/src/base/conv/auto_json.h
@@ -328,7 +328,6 @@ struct JSONObj : protected JSONRepeat<'{', '}'>
 
 	template <class T> JSONObj &&mergeObj(T &&obj) &&
 	{
-		if (was) json.pop_back();
 		auto pre_size = json.size();
 
 		staticObj(obj);
diff --git a/src/chart/rendering/drawlegend.cpp b/src/chart/rendering/drawlegend.cpp
@@ -106,7 +106,7 @@ void DrawLegend::ColorGradientSetter::operator()(Gfx::ICanvas &canvas,
 	for (auto &stop : modifiableStops) stop.value = color;
 
 	modifiableStops[0].value.alpha = 0.0;
-	modifiableStops[5].value.alpha = 0.0;
+	modifiableStops[3].value.alpha = 0.0;
 
 	canvas.setBrushGradient(transform(line), gradient);
 }

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,6 @@ struct JSONObj : protected JSONRepeat<'{', '}'>`
`328`	`328`
`329`	`329`	`template <class T> JSONObj &&mergeObj(T &&obj) &&`
`330`	`330`	`{`
`331`		`- if (was) json.pop_back();`
`332`	`331`	`auto pre_size = json.size();`
`333`	`332`
`334`	`333`	`staticObj(obj);`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void DrawLegend::ColorGradientSetter::operator()(Gfx::ICanvas &canvas,`
`106`	`106`	`for (auto &stop : modifiableStops) stop.value = color;`
`107`	`107`
`108`	`108`	`modifiableStops[0].value.alpha = 0.0;`
`109`		`- modifiableStops[5].value.alpha = 0.0;`
	`109`	`+ modifiableStops[3].value.alpha = 0.0;`
`110`	`110`
`111`	`111`	`canvas.setBrushGradient(transform(line), gradient);`
`112`	`112`	`}`