Scaling and line spacing work

hrydgard · May 26, 2024 · 01b1190 · 01b1190
1 parent 67334c4
commit 01b1190
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Common/Render/Text/draw_text.h b/Common/Render/Text/draw_text.h
@@ -34,6 +34,7 @@ struct TextStringEntry {
 struct TextMeasureEntry {
 	int width;
 	int height;
+	int leading;  // only used with Cocoa
 	int lastUsedFrame;
 };
 

diff --git a/Common/Render/Text/draw_text_cocoa.mm b/Common/Render/Text/draw_text_cocoa.mm
@@ -40,8 +40,8 @@
 
 	void Create() {
 		// Create an attributed string with string and font information
-		CGFloat fontSize = height * dpiScale;
-		INFO_LOG(G3D, "Creating cocoa typeface '%s' size %d", fname.c_str(), height);
+		CGFloat fontSize = height / dpiScale;
+		INFO_LOG(G3D, "Creating cocoa typeface '%s' size %d (effective size %0.1f)", fname.c_str(), height, fontSize);
 		CTFontRef font = CTFontCreateWithName(CFSTR("Helvetica"), fontSize, nil);
 		attributes = [NSDictionary dictionaryWithObjectsAndKeys:
 			(id)font, kCTFontAttributeName,
@@ -86,7 +86,7 @@ void Destroy() {
 	if (fontName)
 		fname = fontName;
 	else
-		fname = "Helvetica Light";
+		fname = "Helvetica";
 
 	TextDrawerFontContext *font = new TextDrawerFontContext();
 	font->bold = false;
@@ -209,14 +209,15 @@ void Destroy() {
 			entry = new TextMeasureEntry();
 			entry->width = width;
 			entry->height = height;
+			entry->leading = leading;
 			sizeCache_[key] = std::unique_ptr<TextMeasureEntry>(entry);
 		}
 		entry->lastUsedFrame = frameCount_;
 
 		if (total_w < entry->width) {
 			total_w = entry->width;
 		}
-		int h = entry->height; // i == lines.size() - 1 ? entry->height : metrics.tmHeight + metrics.tmExternalLeading;
+		int h = i == lines.size() - 1 ? entry->height : (entry->height + entry->leading);
 		total_h += h;
 	}
 
@@ -404,6 +405,7 @@ void Destroy() {
 	// If DPI changed (small-mode, future proper monitor DPI support), drop everything.
 	float newDpiScale = CalculateDPIScale();
 	if (newDpiScale != dpiScale_) {
+		INFO_LOG(G3D, "TextDrawerCocoa: DPI scale: %0.1f", newDpiScale);
 		dpiScale_ = newDpiScale;
 		ClearCache();
 		RecreateFonts();