Logo bottom padding fixed.

Author: simzer

src/chart/main/chart.cpp

@@ -125,14 +125,18 @@ void Chart::draw(Gfx::ICanvas &canvas) const
 			layout.boundary.size.minSize(), 
 			Styles::Sheet::baseFontSize(layout.boundary.size, false));
 
-		auto logoPad = logoStyle.toMargin(Geom::Size(logoWidth, logoWidth), 
+		auto logoHeight = Draw::Logo::height(logoWidth);
+
+		auto logoPad = logoStyle.toMargin(Geom::Size(logoWidth, logoHeight), 
 			Styles::Sheet::baseFontSize(layout.boundary.size, false));
 
 		auto filter = *logoStyle.filter;
-
+	
 		Draw::Logo(canvas).draw(
 			layout.boundary.topRight()
-				- Geom::Point(logoPad.right + logoWidth, logoPad.bottom),
+				- Geom::Point(
+					logoPad.right + logoWidth, 
+					logoPad.bottom + logoHeight),
 			logoWidth, filter);
 	}
 }

src/chart/main/style.cpp

@@ -388,12 +388,12 @@ Chart Chart::def()
 		},
 		.logo = {
 			{
-				.paddingTop = Gfx::Length::Relative(0.375),
-				.paddingRight = Gfx::Length::Relative(0.375),
-				.paddingBottom = Gfx::Length::Relative(0.375),
-				.paddingLeft = Gfx::Length::Relative(0.375)
+				.paddingTop = Gfx::Length::Relative(0.475),
+				.paddingRight = Gfx::Length::Relative(0.4),
+				.paddingBottom = Gfx::Length::Relative(0.475),
+				.paddingLeft = Gfx::Length::Relative(0.4)
 			},
-			.width = Gfx::Length::Emphemeral(40/12.13526042),
+			.width = Gfx::Length::Emphemeral(40.0*2900/3000/12.13526042),
 			.filter = Gfx::ColorTransform::OverrideColor(Gfx::Color::Gray(0.85))
 		}
 	};

src/chart/rendering/logo.cpp

@@ -19,37 +19,43 @@ Logo::circleColors{{
 //todo: create Gfx::Path, Gfx::Drawing classes
 const Logo::Points Logo::points
 {{
-	{56, 0}, {370, 760}, {684, 0}, {532, 0}, {370, 425}, {208, 0}, // V
-	{784, 0}, {784, 752}, {924, 752}, {924, 0}, // I
-	{1188, 752}, {1620, 0}, {1464, 0}, {1034, 752}, // Z
-	{1862, 752}, {2294, 0}, {2138, 0}, {1708, 752}, // Z
+	{0, 0}, {314, 760}, {628, 0}, {476, 0}, {314, 425}, {152, 0}, // V
+	{728, 0}, {728, 752}, {868, 752}, {868, 0}, // I
+	{1132, 752}, {1564, 0}, {1408, 0}, {978, 752}, // Z
+	{1806, 752}, {2238, 0}, {2082, 0}, {1652, 752}, // Z
 
 	// U
-	{2530, 0},
-	{2390, 0},
-	{2390, 480},
-	{2390, 650}, {2522, 766}, {2673, 766},
-	{2824, 766}, {2956, 650}, {2956, 480},
-	{2956, 0},
-	{2816, 0},
-	{2816, 480},
-	{2820, 578}, {2762, 634}, {2673, 634},
-	{2584, 634}, {2530, 578}, {2530, 480},
+	{2474, 0},
+	{2334, 0},
+	{2334, 480},
+	{2334, 650}, {2466, 766}, {2617, 766},
+	{2768, 766}, {2900, 650}, {2900, 480},
+	{2900, 0},
+	{2760, 0},
+	{2760, 480},
+	{2764, 578}, {2706, 634}, {2617, 634},
+	{2528, 634}, {2474, 578}, {2474, 480},
 
 	// circles
-	{1146, 99},
-	{1820, 99},
-	{1522, 652},
-	{2196, 652}
+	{1090, 99},
+	{1764, 99},
+	{1466, 652},
+	{2140, 652}
 }};
 
+
+double Logo::height(double width)
+{
+	return defaultHeight * width / defaultWidth;
+}
+
 void Logo::draw(Geom::Point pos,
     double width,
     const Gfx::ColorTransform &colorTransform)
 {
 	this->index = 0;
 	this->pos = pos;
-	this->factor = width / defaultSize;
+	this->factor = width / defaultWidth;
 
 	setColor(colorTransform(Gfx::Color::Black()));
 	canvas.setLineWidth(0);

src/chart/rendering/logo.h

@@ -18,13 +18,16 @@ class Logo
 	Logo(Gfx::ICanvas &canvas) : canvas(canvas) {}
 	void draw(Geom::Point pos, double width,
 			  const Gfx::ColorTransform &colorTransform);
-	
+
+	static double height(double width);
+
 private:
 	struct Point { uint16_t x; uint16_t y; };
 	typedef std::array<Point, 6 + 4 + 4 + 4 + (10 + 4*2) + 4> Points;
 
 	static const Points points;
-	static const size_t defaultSize = 3000;
+	static const size_t defaultWidth = 2900;
+	static const size_t defaultHeight = 766;
 	static const size_t defaultRadius;
 	static const std::array<Gfx::Color, 4> circleColors;