[Fix] Conflicts

This commit is contained in:
Quentin
2020-04-16 14:04:56 +02:00
335 changed files with 2110 additions and 1685 deletions

View File

@@ -69,8 +69,8 @@ void FunctionGraphView::reloadBetweenBounds(float start, float end) {
if (start == end) {
return;
}
float pixelLowerBound = floatToPixel(Axis::Horizontal, start)-2.0;
float pixelUpperBound = floatToPixel(Axis::Horizontal, end)+4.0;
float pixelLowerBound = floatToPixel(Axis::Horizontal, start) - 2.0f;
float pixelUpperBound = floatToPixel(Axis::Horizontal, end) + 4.0f;
/* We exclude the banner frame from the dirty zone to avoid unnecessary
* redrawing */
KDRect dirtyZone(KDRect(pixelLowerBound, 0, pixelUpperBound-pixelLowerBound,