amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix font resolution on Linux.

Browse Source
This commit is contained in:
Lymia Aluysia
2017-01-18 08:24:12 -06:00
parent d4e95c4a9d
commit d78101bcd7
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/font.cpp
+10 -1
View File
@@ -76,12 +76,14 @@ FontP Font::make(int add_flags, AColor* other_color, double* other_size) const {
return f; return f;
} }
static const String BOLD_STRING = _(" Bold");
wxFont Font::toWxFont(double scale) const { wxFont Font::toWxFont(double scale) const {
int size_i = to_int(scale * size); int size_i = to_int(scale * size);
int weight_i = flags & FONT_BOLD ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL; int weight_i = flags & FONT_BOLD ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL;
int style_i = flags & FONT_ITALIC ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL; int style_i = flags & FONT_ITALIC ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL;
// make font // make font
wxFont font; wxFont font;
if (flags & FONT_CODE) { if (flags & FONT_CODE) {
if (size_i < 2) { if (size_i < 2) {
return wxFont(wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, weight_i, underline(), _("Courier New")); return wxFont(wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, weight_i, underline(), _("Courier New"));
@@ -95,7 +97,14 @@ wxFont Font::toWxFont(double scale) const {
} else if (flags & FONT_ITALIC && !italic_name().empty()) { } else if (flags & FONT_ITALIC && !italic_name().empty()) {
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name()); font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name());
} else { } else {
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, style_i, weight_i, underline(), name()); String familyName = name();
if(familyName.EndsWith(BOLD_STRING)) {
familyName = familyName.Left(familyName.length() - BOLD_STRING.length());
weight_i = wxFONTWEIGHT_BOLD;
}
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, style_i, weight_i, underline(), familyName);
} }
// fix size // fix size
#ifdef __WXMSW__ #ifdef __WXMSW__