mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-07-02 06:35:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #18 from WaywardHeart/font-families

Browse source 
Make font families case insensitive
This commit is contained in:
Splendide Imaginarius 2023-10-29 11:05:50 +00:00 • committed by GitHub
commit 77dedd06db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/config.cpp
View file

@ -276,6 +276,9 @@ try { exp } catch (...) {}
SET_OPT(frameSkip, boolean); SET_OPT(frameSkip, boolean);
SET_OPT(syncToRefreshrate, boolean); SET_OPT(syncToRefreshrate, boolean);
fillStringVec(opts["solidFonts"], solidFonts); fillStringVec(opts["solidFonts"], solidFonts);
for (std::string & solidFont : solidFonts)
std::transform(solidFont.begin(), solidFont.end(), solidFont.begin(),
[](unsigned char c) { return std::tolower(c); });
#ifdef __APPLE__ #ifdef __APPLE__
SET_OPT(preferMetalRenderer, boolean); SET_OPT(preferMetalRenderer, boolean);
#endif #endif
@ -298,6 +301,9 @@ try { exp } catch (...) {}
fillStringVec(opts["preloadScript"], preloadScripts); fillStringVec(opts["preloadScript"], preloadScripts);
fillStringVec(opts["RTP"], rtps); fillStringVec(opts["RTP"], rtps);
fillStringVec(opts["fontSub"], fontSubs); fillStringVec(opts["fontSub"], fontSubs);
for (std::string & fontSub : fontSubs)
std::transform(fontSub.begin(), fontSub.end(), fontSub.begin(),
[](unsigned char c) { return std::tolower(c); });
fillStringVec(opts["rubyLoadpath"], rubyLoadpaths); fillStringVec(opts["rubyLoadpath"], rubyLoadpaths);
auto &bnames = opts["bindingNames"].as_object(); auto &bnames = opts["bindingNames"].as_object();

11
src/display/font.cpp
View file

@ -32,6 +32,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <algorithm>
#include <cctype>
#ifdef MKXPZ_BUILD_XCODE #ifdef MKXPZ_BUILD_XCODE
#include "filesystem/filesystem.h" #include "filesystem/filesystem.h"
@ -149,6 +151,9 @@ void SharedFontState::initFontSetCB(SDL_RWops &ops,
std::string family = TTF_FontFaceFamilyName(font); std::string family = TTF_FontFaceFamilyName(font);
std::string style = TTF_FontFaceStyleName(font); std::string style = TTF_FontFaceStyleName(font);
std::transform(family.begin(), family.end(), family.begin(),
[](unsigned char c){ return std::tolower(c); });
TTF_CloseFont(font); TTF_CloseFont(font);
FontSet &set = p->sets[family]; FontSet &set = p->sets[family];
@ -162,6 +167,9 @@ void SharedFontState::initFontSetCB(SDL_RWops &ops,
_TTF_Font *SharedFontState::getFont(std::string family, _TTF_Font *SharedFontState::getFont(std::string family,
int size) int size)
{ {
std::transform(family.begin(), family.end(), family.begin(),
[](unsigned char c){ return std::tolower(c); });
if (family.empty()) if (family.empty())
family = p->defaultFamily; family = p->defaultFamily;
@ -219,6 +227,9 @@ _TTF_Font *SharedFontState::getFont(std::string family,
bool SharedFontState::fontPresent(std::string family) const bool SharedFontState::fontPresent(std::string family) const
{ {
std::transform(family.begin(), family.end(), family.begin(),
[](unsigned char c){ return std::tolower(c); });
/* Check for substitutions */ /* Check for substitutions */
if (p->subs.contains(family)) if (p->subs.contains(family))
family = p->subs[family]; family = p->subs[family];