made fonts available without installing system-wide

CMakeSettings.json

@@ -64,7 +64,14 @@
       "cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ]
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": [
+        {
+          "name": "VCPKG_MANIFEST_FEATURES",
+          "value": "fonts",
+          "type": "STRING"
+        }
+      ]
     }
   ]
-}
+}

src/data/font.cpp

@@ -8,7 +8,10 @@
 
 #include <util/prec.hpp>
 #include <data/font.hpp>
-
+#include <wx/stdpaths.h>
+#include <wx/dir.h>
+#include <wx/font.h>
+
 // ----------------------------------------------------------------------------- : Font
 
 Font::Font()
@@ -23,6 +26,41 @@ Font::Font()
   , separator_color(Color(0,0,0,128))
   , flags(FONT_NORMAL)
 {}
+
+bool Font::PreloadResourceFonts() {
+#if wxUSE_PRIVATE_FONTS  
+  wxUniChar pathSeparator = wxFileName::GetPathSeparator();
+  String appPath( wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath() );
+  String fontsPath = appPath + pathSeparator + "resource" + pathSeparator + "fonts" + pathSeparator;
+
+  if (!wxDirExists(fontsPath))
+    return false;
+  
+  wxDir fontsDirectory(fontsPath);
+  vector<String> fontFilePaths;
+  String fontFileName = "";
+
+  // are there any font files in the resource/fonts directory?
+  if (!fontsDirectory.GetFirst(&fontFileName, "*.ttf"))
+    return false;
+
+  fontFilePaths.push_back(fontsPath + fontFileName);
+  while (fontsDirectory.GetNext(&fontFileName))
+    fontFilePaths.push_back(fontsPath + fontFileName);
+
+  bool preloadHadErrors = false;
+  for (String fn : fontFilePaths) {
+    if (!wxFont::AddPrivateFont(fn)) {
+      preloadHadErrors = true;
+      continue;
+    }
+  }
+
+  return preloadHadErrors;
+
+#endif // wxUSE_PRIVATE_FONTS
+  return false;
+}
 
 bool Font::update(Context& ctx) {
   bool changes = false;

src/data/font.hpp

@@ -45,10 +45,12 @@ public:
   RealSize           shadow_displacement;  ///< Position of the shadow
   double             shadow_blur;          ///< Blur radius of the shadow
   Color              separator_color;      ///< Color for <sep> text
-  int                flags;                ///< FontFlags for this font
-  
+  int                flags;                ///< FontFlags for this font
+
   Font();
-  
+
+  /// Load fonts (.ttf) from the resource/fonts directory
+  static bool PreloadResourceFonts();   
   /// Update the scritables, returns true if there is a change
   bool update(Context& ctx);
   /// Add the given dependency to the dependent_scripts list for the variables this font depends on
@@ -64,7 +66,7 @@ public:
   
   /// Convert this font to a wxFont
   wxFont toWxFont(double scale) const;
-  
+
 private:
   DECLARE_REFLECTION();
 };

src/main.cpp

@@ -15,6 +15,7 @@
 #include <data/locale.hpp>
 #include <data/installer.hpp>
 #include <data/format/formats.hpp>
+#include <data/font.hpp>
 #include <cli/cli_main.hpp>
 #include <cli/text_io_handler.hpp>
 #include <gui/welcome_window.hpp>
@@ -86,6 +87,7 @@ int MSE::OnRun() {
       // Platform friendly appname
       SetAppName(_("magicseteditor"));
     #endif
+    Font::PreloadResourceFonts();
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxInternetFSHandler); // needed for update checker
     wxSocketBase::Initialize();