mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Revert spelling change to preserve consistency, fix a typo

Browse source
This commit is contained in:
MiroslavR 2014-10-03 22:38:06 +02:00
parent 4829b1f9cc
commit 95be7ea738
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -212,7 +212,7 @@ namespace MWGui
else else
{ {
// Each block of text (between two tags / boundary and tag) will be displayed in a separate editbox widget, // Each block of text (between two tags / boundary and tag) will be displayed in a separate editbox widget,
// which means an additonal linebreak will be created between them. // which means an additional linebreak will be created between them.
// ^ This is not what vanilla MW assumes, so we must deal with line breaks around tags appropriately. // ^ This is not what vanilla MW assumes, so we must deal with line breaks around tags appropriately.
bool brAtStart = (plainText[0] == '\n'); bool brAtStart = (plainText[0] == '\n');
bool brAtEnd = (plainText[plainText.size()-1] == '\n'); bool brAtEnd = (plainText[plainText.size()-1] == '\n');
@ -323,7 +323,7 @@ namespace MWGui
ss << attr.at("color"); ss << attr.at("color");
ss >> std::hex >> color; ss >> std::hex >> color;
mTextStyle.mColor = MyGUI::Colour( mTextStyle.mColour = MyGUI::Colour(
(color>>16 & 0xFF) / 255.f, (color>>16 & 0xFF) / 255.f,
(color>>8 & 0xFF) / 255.f, (color>>8 & 0xFF) / 255.f,
(color & 0xFF) / 255.f); (color & 0xFF) / 255.f);
@ -380,7 +380,7 @@ namespace MWGui
box->setProperty("NeedMouse", "false"); box->setProperty("NeedMouse", "false");
box->setMaxTextLength(text.size()); box->setMaxTextLength(text.size());
box->setTextAlign(mBlockStyle.mAlign); box->setTextAlign(mBlockStyle.mAlign);
box->setTextColour(mTextStyle.mColor); box->setTextColour(mTextStyle.mColour);
box->setFontName(mTextStyle.mFont); box->setFontName(mTextStyle.mFont);
box->setCaption(MyGUI::TextIterator::toTagsString(text)); box->setCaption(MyGUI::TextIterator::toTagsString(text));
box->setSize(box->getSize().width, box->getTextSize().height); box->setSize(box->getSize().width, box->getTextSize().height);

4
apps/openmw/mwgui/formatting.hpp
View file

@ -11,13 +11,13 @@ namespace MWGui
struct TextStyle struct TextStyle
{ {
TextStyle() : TextStyle() :
mColor(0,0,0) mColour(0,0,0)
, mFont("Default") , mFont("Default")
, mTextSize(16) , mTextSize(16)
{ {
} }
MyGUI::Colour mColor; MyGUI::Colour mColour;
std::string mFont; std::string mFont;
int mTextSize; int mTextSize;
}; };