Merge branch 'master' into jgrpp

# Conflicts: # src/os/macosx/string_osx.cpp
2022-12-20 18:05:43 +00:00
parent 16a3e0ef59 c962c77306
commit 9e33153df9
15 changed files with 45 additions and 30 deletions
--- a/src/fontcache.h
+++ b/src/fontcache.h
@@ -33,12 +33,12 @@ protected:
 	int descender;                    ///< The descender value of the font.
 	int units_per_em;                 ///< The units per EM value of the font.

-	static int GetDefaultFontHeight(FontSize fs);
-
 public:
 	FontCache(FontSize fs);
 	virtual ~FontCache();

+	static int GetDefaultFontHeight(FontSize fs);
+
 	/**
 	 * Get the FontSize of the font.
 	 * @return The FontSize.