From c8b08540989f3b16973a395e9e163a225ee47055 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 May 2015 18:25:28 +0300 Subject: Add safeDraw method into avatarlistbox. --- src/gui/widgets/avatarlistbox.cpp | 244 ++++++++++++++++++++++++++++++++++++-- src/gui/widgets/avatarlistbox.h | 2 + 2 files changed, 237 insertions(+), 9 deletions(-) diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index b497bc8a4..4e0fbb287 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -122,7 +122,6 @@ void AvatarListBox::draw(Graphics *graphics) // Draw the list elements ImageCollection vertexes; - const bool useCaching = isBatchDrawRenders(openGLMode); for (int i = 0, y = 0; i < model->getNumberOfElements(); @@ -141,23 +140,250 @@ void AvatarListBox::draw(Graphics *graphics) ? onlineIcon : offlineIcon; if (icon) { - if (useCaching) + graphics->calcTileCollection(&vertexes, icon, + mImagePadding, y + mPadding); + } + } + } + + graphics->finalize(&vertexes); + graphics->drawTileCollection(&vertexes); + + for (int i = 0, y = 0; + i < model->getNumberOfElements(); + ++i, y += fontHeight) + { + const Avatar *const a = model->getAvatarAt(i); + if (!a) + continue; + + const MapItemType::Type type = static_cast( + a->getType()); + std::string text; + + if (a->getMaxHp() > 0) + { + if (mShowLevel && a->getLevel() > 1) + { + text = strprintf("%s %d/%d (%d)", a->getComplexName().c_str(), + a->getHp(), a->getMaxHp(), a->getLevel()); + } + else + { + text = strprintf("%s %d/%d", a->getComplexName().c_str(), + a->getHp(), a->getMaxHp()); + } + const bool isPoison = a->getPoison(); + if (a->getMaxHp()) + { + const int themeColor = (isPoison + ? Theme::PROG_HP_POISON : Theme::PROG_HP); + Color color = Theme::getProgressColor( + themeColor, static_cast(a->getHp()) + / static_cast(a->getMaxHp())); + color.a = 80; + graphics->setColor(color); + graphics->fillRectangle(Rect(mPadding, y + mPadding, + parent->getWidth() * a->getHp() / a->getMaxHp() + - 2 * mPadding, fontHeight)); + } + } + else if (a->getDamageHp() != 0 && a->getName() != name) + { + if (mShowLevel && a->getLevel() > 1) + { + text = strprintf("%s -%d (%d)", a->getComplexName().c_str(), + a->getDamageHp(), a->getLevel()); + } + else + { + text = strprintf("%s -%d", a->getComplexName().c_str(), + a->getDamageHp()); + } + + const int themeColor = (a->getPoison() + ? Theme::PROG_HP_POISON : Theme::PROG_HP); + Color color = Theme::getProgressColor(themeColor, 1); + color.a = 80; + graphics->setColor(color); + graphics->fillRectangle(Rect(mPadding, y + mPadding, + parent->getWidth() * a->getDamageHp() / 1024 + - 2 * mPadding, fontHeight)); + + if (a->getLevel() > 1) + { + graphics->setColor(mForegroundColor); + int minHp = 40 + ((a->getLevel() - 1) * 5); + if (minHp < 0) + minHp = 40; + + graphics->drawLine(parent->getWidth()*minHp / 1024 + + mPadding, y + mPadding, + parent->getWidth() * minHp / 1024, y + fontHeight); + } + } + else + { + if (mShowLevel && a->getLevel() > 1) + { + text = strprintf("%s (%d)", a->getComplexName().c_str(), + a->getLevel()); + } + else + { + text = a->getComplexName(); + } + } + + if (!a->getMap().empty()) + { + if (a->getX() != -1) + { + text.append(strprintf(" [%d,%d %s]", a->getX(), a->getY(), + a->getMap().c_str())); + } + else + { + text.append(strprintf(" [%s]", a->getMap().c_str())); + } + } + + if (graphics->getSecure()) + { + if (mShowGender) + { + switch (a->getGender()) { - graphics->calcTileCollection(&vertexes, icon, - mImagePadding, y + mPadding); + case Gender::FEMALE: + text.append(" \u2640 "); + break; + case Gender::MALE: + text.append(" \u2642 "); + break; + default: + case Gender::UNSPECIFIED: + case Gender::OTHER: + break; } - else + } + } + else + { + if (mShowGender) + { + switch (a->getGender()) { - graphics->drawImage(icon, mImagePadding, y + mPadding); + case Gender::FEMALE: + text.append(strprintf(" \u2640 %s", + a->getAdditionString().c_str())); + break; + case Gender::MALE: + text.append(strprintf(" \u2642 %s", + a->getAdditionString().c_str())); + break; + default: + case Gender::UNSPECIFIED: + case Gender::OTHER: + break; } } + else + { + text.append(a->getAdditionString()); + } + } + + // Draw Name + if (a->getDisplayBold()) + { + if (type == MapItemType::SEPARATOR) + { + boldFont->drawString(graphics, + mForegroundColor, + mForegroundColor, + text, + mImagePadding + mPadding, + y + mPadding); + } + else + { + boldFont->drawString(graphics, + mForegroundColor, + mForegroundColor, + text, + 15 + mImagePadding + mPadding, + y + mPadding); + } + } + else + { + if (type == MapItemType::SEPARATOR) + { + font->drawString(graphics, + mForegroundColor, + mForegroundColor, + text, + mImagePadding + mPadding, + y + mPadding); + } + else + { + font->drawString(graphics, + mForegroundColor, + mForegroundColor, + text, + 15 + mImagePadding + mPadding, + y + mPadding); + } } } - if (useCaching) + setWidth(parent->getWidth() - 10); + BLOCK_END("AvatarListBox::draw") +} + +void AvatarListBox::safeDraw(Graphics *graphics) +{ + BLOCK_START("AvatarListBox::draw") + if (!mListModel || !localPlayer) { - graphics->finalize(&vertexes); - graphics->drawTileCollection(&vertexes); + BLOCK_END("AvatarListBox::draw") + return; + } + + const Widget *const parent = mParent; + if (!parent) + return; + + AvatarListModel *const model = static_cast( + mListModel); + updateAlpha(); + + Font *const font = getFont(); + const int fontHeight = getFont()->getHeight(); + const std::string &name = localPlayer->getName(); + + // Draw the list elements + ImageCollection vertexes; + + for (int i = 0, y = 0; + i < model->getNumberOfElements(); + ++i, y += fontHeight) + { + const Avatar *const a = model->getAvatarAt(i); + if (!a) + continue; + + const MapItemType::Type type = static_cast( + a->getType()); + if (type != MapItemType::SEPARATOR) + { + // Draw online status + const Image *const icon = a->getOnline() + ? onlineIcon : offlineIcon; + if (icon) + graphics->drawImage(icon, mImagePadding, y + mPadding); + } } for (int i = 0, y = 0; diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index ad70e19dc..7c59f0924 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -43,6 +43,8 @@ class AvatarListBox final : public ListBox, */ void draw(Graphics *gcnGraphics) override final; + void safeDraw(Graphics *gcnGraphics) override final; + void mousePressed(MouseEvent &event) override final; void mouseReleased(MouseEvent &event A_UNUSED) override final; -- cgit v1.2.3-60-g2f50