From cdc721a1c6c5cf80736101352161b66ea3f90c50 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 27 Dec 2012 16:48:32 +0300 Subject: Remove set font from graphics object. --- src/gui/widgets/avatarlistbox.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/gui/widgets/avatarlistbox.cpp') diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index d9fe65dfe..a8052fd8d 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -106,7 +106,6 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics) mHighlightColor.a = static_cast(mAlpha * 255.0f); gcn::Font *const font = getFont(); - graphics->setFont(font); const int fontHeight = getFont()->getHeight(); const gcn::Widget *const parent = mParent; @@ -131,9 +130,6 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics) graphics->drawImage(icon, mPadding, y + mPadding); } - if (a->getDisplayBold()) - graphics->setFont(boldFont); - std::string text; if (a->getMaxHp() > 0) @@ -268,13 +264,25 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics) graphics->setColor(mForegroundColor); // Draw Name - if (a->getType() == MapItem::SEPARATOR) - font->drawString(graphics, text, mPadding, y + mPadding); - else - font->drawString(graphics, text, 15 + mPadding, y + mPadding); - if (a->getDisplayBold()) - graphics->setFont(getFont()); + { + if (a->getType() == MapItem::SEPARATOR) + { + boldFont->drawString(graphics, text, mPadding, y + mPadding); + } + else + { + boldFont->drawString(graphics, text, + 15 + mPadding, y + mPadding); + } + } + else + { + if (a->getType() == MapItem::SEPARATOR) + font->drawString(graphics, text, mPadding, y + mPadding); + else + font->drawString(graphics, text, 15 + mPadding, y + mPadding); + } } setWidth(parent->getWidth() - 10); -- cgit v1.2.3-70-g09d2