X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fjpeg_frame_view.cpp;h=eb0ed0925947b5a1571d6ba0ff46a00d1bc5385f;hp=adc376455ec4eb06c7f8e5550b38037fa1aebeb8;hb=04738b0cecf5f7b6d988822c1d7595fdd52a496e;hpb=622b1e84c60f315cf2980efbf1b54cc049a7d2ce

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index adc3764..eb0ed09 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -465,10 +465,25 @@ void JPEGFrameView::set_overlay(const string &text)
 		return;
 	}
 
+	// Figure out how large the texture needs to be.
+	{
+		QImage img(overlay_width, overlay_height, QImage::Format_Grayscale8);
+		QPainter painter(&img);
+		QFont font = painter.font();
+		font.setPointSize(12);
+		QFontMetrics metrics(font);
+		overlay_base_width = lrint(metrics.boundingRect(QString::fromStdString(text)).width() + 8.0);
+		overlay_base_height = lrint(metrics.height());
+	}
+
 	float dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
 	overlay_width = lrint(overlay_base_width * dpr);
 	overlay_height = lrint(overlay_base_height * dpr);
 
+	// Work around OpenGL alignment issues.
+	while (overlay_width % 4 != 0) ++overlay_width;
+
+	// Now do the actual drawing.
 	overlay_image.reset(new QImage(overlay_width, overlay_height, QImage::Format_Grayscale8));
 	overlay_image->setDevicePixelRatio(dpr);
 	overlay_image->fill(0);