diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 23:42:57 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 23:42:57 +0100 |
| commit | cd20fb3432498b8871401bdd65a143197e2a6538 (patch) | |
| tree | 1edd3e20e3501de5315fa5bfc46b8673ad40d5dd /src/gui/widgets/textpreview.cpp | |
| parent | 4ba8c80791c15c144d66e6a9b23e878d3313fa26 (diff) | |
| download | mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.gz mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.bz2 mana-cd20fb3432498b8871401bdd65a143197e2a6538.tar.xz mana-cd20fb3432498b8871401bdd65a143197e2a6538.zip | |
A host of code style fixes
Mostly putting & and * in the right place and making some getters const.
Diffstat (limited to 'src/gui/widgets/textpreview.cpp')
| -rw-r--r-- | src/gui/widgets/textpreview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 01790a67..7d4fbd80 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -32,9 +32,9 @@ float TextPreview::mAlpha = config.getValue("guialpha", 0.8); -TextPreview::TextPreview(const std::string* text) +TextPreview::TextPreview(const std::string &text): + mText(text) { - mText = text; mTextAlpha = false; mFont = gui->getFont(); mTextColor = &guiPalette->getColor(Palette::TEXT); @@ -65,7 +65,7 @@ void TextPreview::draw(gcn::Graphics* graphics) if (mTextBGColor && typeid(*mFont) == typeid(TrueTypeFont)) { TrueTypeFont *font = static_cast<TrueTypeFont*>(mFont); - int x = font->getWidth(*mText) + 1 + 2 * ((mOutline || mShadow) ? 1 :0); + int x = font->getWidth(mText) + 1 + 2 * ((mOutline || mShadow) ? 1 :0); int y = font->getHeight() + 1 + 2 * ((mOutline || mShadow) ? 1 : 0); graphics->setColor(gcn::Color((int) mTextBGColor->r, (int) mTextBGColor->g, @@ -74,7 +74,7 @@ void TextPreview::draw(gcn::Graphics* graphics) graphics->fillRectangle(gcn::Rectangle(1, 1, x, y)); } - TextRenderer::renderText(graphics, *mText, 2, 2, gcn::Graphics::LEFT, + TextRenderer::renderText(graphics, mText, 2, 2, gcn::Graphics::LEFT, gcn::Color(mTextColor->r, mTextColor->g, mTextColor->b, alpha), mFont, mOutline, mShadow, alpha); |