[Scummvm-git-logs] scummvm master -> 15704239b8b30afa54cdd8683ba849543aeffe9f

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a2a33b8f19 GRAPHICS: Added getFontName method to TTFFont
15704239b8 AGS: Properly implement alfont_get_name


Commit: a2a33b8f199c71b5fef35616456e9392e9502f0f
    https://github.com/scummvm/scummvm/commit/a2a33b8f199c71b5fef35616456e9392e9502f0f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-14T21:57:14-07:00

Commit Message:
GRAPHICS: Added getFontName method to TTFFont

Changed paths:
    graphics/font.h
    graphics/fonts/ttf.cpp


diff --git a/graphics/font.h b/graphics/font.h
index e82099313e1..658df0e5aa4 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -91,6 +91,11 @@ public:
 	 */
 	virtual int getFontHeight() const = 0;
 
+	/**
+	 * Returns the font's name, if one is available
+	 */
+	virtual Common::String getFontName() const { return ""; }
+
 	/**
 	 * Return the ascent of the font.
 	 *
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 8a0279aa522..1b0227a5b1e 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -147,7 +147,7 @@ public:
 	          int size, TTFSizeMode sizeMode, uint dpi, TTFRenderMode renderMode, const uint32 *mapping, bool stemDarkening);
 
 	virtual int getFontHeight() const;
-
+	Common::String getFontName() const override;
 	virtual int getFontAscent() const;
 
 	virtual int getMaxCharWidth() const;


Commit: 15704239b8b30afa54cdd8683ba849543aeffe9f
    https://github.com/scummvm/scummvm/commit/15704239b8b30afa54cdd8683ba849543aeffe9f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-14T22:12:40-07:00

Commit Message:
AGS: Properly implement alfont_get_name

Changed paths:
    engines/ags/lib/alfont/alfont.cpp
    engines/ags/lib/alfont/alfont.h
    graphics/fonts/ttf.cpp


diff --git a/engines/ags/lib/alfont/alfont.cpp b/engines/ags/lib/alfont/alfont.cpp
index d05fc6d7766..21ed7b97527 100644
--- a/engines/ags/lib/alfont/alfont.cpp
+++ b/engines/ags/lib/alfont/alfont.cpp
@@ -48,6 +48,8 @@ Graphics::Font *ALFONT_FONT::getFont() {
 		}
 		_fonts[_size] = font;
 		assert(_fonts[_size]);
+
+		_fontName = _fonts[_size]->getFontName();
 	}
 
 	return _fonts[_size];
@@ -116,8 +118,8 @@ int alfont_get_font_real_height(ALFONT_FONT *font) {
 }
 
 const char *alfont_get_name(ALFONT_FONT *font) {
-	// TODO: Return ttf font name
-	return "Unsupported";
+	(void)font->getFont();	// Ensure a font is loaded
+	return font->_fontName.c_str();
 }
 
 } // namespace AGS3
diff --git a/engines/ags/lib/alfont/alfont.h b/engines/ags/lib/alfont/alfont.h
index 7b1b0b35076..3803e1eda6c 100644
--- a/engines/ags/lib/alfont/alfont.h
+++ b/engines/ags/lib/alfont/alfont.h
@@ -33,6 +33,7 @@ struct ALFONT_FONT {
 	Common::MemoryReadStream _ttfData;
 	int _size;
 	Common::HashMap<int, Graphics::Font *> _fonts;
+	Common::String _fontName;
 
 	ALFONT_FONT() : _size(-1), _ttfData(nullptr, 0) {}
 	ALFONT_FONT(const byte *data, int size) : _size(-1), _ttfData(data, size, DisposeAfterUse::YES) {}
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 1b0227a5b1e..5a993866ca3 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -540,6 +540,10 @@ int TTFFont::getFontHeight() const {
 	return _height;
 }
 
+Common::String TTFFont::getFontName() const {
+	return _face->family_name;
+}
+
 int TTFFont::getFontAscent() const {
 	return _ascent;
 }