mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 19:06:41 +00:00
Code Issues Releases Wiki Activity

Set glyph width/height separately from texture coordinates (Bug #1096)

Browse source 
Requires MyGUI SVN
This commit is contained in:
scrawl 2014-08-07 16:27:39 +02:00
parent 22d7d8a466
commit 143609be59
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/fontloader.cpp
View file

@ -257,6 +257,7 @@ namespace MWGui
code->addAttribute("advance", data[i].width); code->addAttribute("advance", data[i].width);
code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " " code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
+ MyGUI::utility::toString((fontSize-data[i].ascent))); + MyGUI::utility::toString((fontSize-data[i].ascent)));
code->addAttribute("size", MyGUI::IntSize(data[i].width, data[i].height));
// More hacks! The french game uses several win1252 characters that are not included // More hacks! The french game uses several win1252 characters that are not included
// in the cp437 encoding of the font. Fall back to similar available characters. // in the cp437 encoding of the font. Fall back to similar available characters.
@ -302,6 +303,7 @@ namespace MWGui
code->addAttribute("advance", data[i].width); code->addAttribute("advance", data[i].width);
code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " " code->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
+ MyGUI::utility::toString((fontSize-data[i].ascent))); + MyGUI::utility::toString((fontSize-data[i].ascent)));
code->addAttribute("size", MyGUI::IntSize(data[i].width, data[i].height));
} }
} }
@ -317,6 +319,7 @@ namespace MWGui
cursorCode->addAttribute("advance", data[i].width); cursorCode->addAttribute("advance", data[i].width);
cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " " cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
+ MyGUI::utility::toString((fontSize-data[i].ascent))); + MyGUI::utility::toString((fontSize-data[i].ascent)));
cursorCode->addAttribute("size", MyGUI::IntSize(data[i].width, data[i].height));
} }
// Question mark, use for NotDefined marker (used for glyphs not existing in the font) // Question mark, use for NotDefined marker (used for glyphs not existing in the font)
@ -331,6 +334,7 @@ namespace MWGui
cursorCode->addAttribute("advance", data[i].width); cursorCode->addAttribute("advance", data[i].width);
cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " " cursorCode->addAttribute("bearing", MyGUI::utility::toString(data[i].kerning) + " "
+ MyGUI::utility::toString((fontSize-data[i].ascent))); + MyGUI::utility::toString((fontSize-data[i].ascent)));
cursorCode->addAttribute("size", MyGUI::IntSize(data[i].width, data[i].height));
} }
} }
@ -348,7 +352,7 @@ namespace MWGui
cursorCode->addAttribute("coord", "0 0 0 0"); cursorCode->addAttribute("coord", "0 0 0 0");
cursorCode->addAttribute("advance", "0"); cursorCode->addAttribute("advance", "0");
cursorCode->addAttribute("bearing", "0 0"); cursorCode->addAttribute("bearing", "0 0");
cursorCode->addAttribute("size", "0 0");
} }
font->deserialization(root, MyGUI::Version(3,2,0)); font->deserialization(root, MyGUI::Version(3,2,0));