games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Merge pull request #5132 from Laserlicht/graphical

Browse Source 
[1.6.1] correct align of thiefguild text an add popup
This commit is contained in:
Ivan Savenko 2024-12-24 13:19:55 +02:00 committed by GitHub
commit 86f42a1c05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/windows/GUIClasses.cpp
View File

@ -1398,15 +1398,17 @@ CThievesGuildWindow::CThievesGuildWindow(const CGObjectInstance * _owner):
bestHeroes.push_back(std::make_shared<CAnimImage>(AnimationPath::builtin("PortraitsSmall"), iter.second.getIconIndex(), 0, 260 + 66 * counter, 360)); bestHeroes.push_back(std::make_shared<CAnimImage>(AnimationPath::builtin("PortraitsSmall"), iter.second.getIconIndex(), 0, 260 + 66 * counter, 360));
//TODO: r-click info: //TODO: r-click info:
// - r-click on hero // - r-click on hero
// - r-click on primary skill label
if(iter.second.details) if(iter.second.details)
{ {
primSkillHeaders.push_back(std::make_shared<CTextBox>(CGI->generaltexth->allTexts[184], Rect(260 + 66*counter, 396, 52, 64), std::vector<std::string> lines;
0, FONT_TINY, ETextAlignment::TOPLEFT, Colors::WHITE)); boost::split(lines, CGI->generaltexth->allTexts[184], boost::is_any_of("\n"));
for(int i=0; i<GameConstants::PRIMARY_SKILLS; ++i)
for(int i=0; i<iter.second.details->primskills.size(); ++i)
{ {
primSkillValues.push_back(std::make_shared<CLabel>(310 + 66 * counter, 407 + 11*i, FONT_TINY, ETextAlignment::BOTTOMRIGHT, Colors::WHITE, primSkillHeaders.push_back(std::make_shared<CLabel>(260 + 66 * counter, 407 + 11 * i, FONT_TINY, ETextAlignment::BOTTOMLEFT, Colors::WHITE, lines[i]));
primSkillHeadersArea.push_back(std::make_shared<LRClickableArea>(Rect(primSkillHeaders.back()->pos.x - pos.x, primSkillHeaders.back()->pos.y - pos.y - 11, 50, 11), nullptr, [i]{
CRClickPopup::createAndPush(CGI->generaltexth->arraytxt[2 + i]);
}));
primSkillValues.push_back(std::make_shared<CLabel>(310 + 66 * counter, 407 + 11 * i, FONT_TINY, ETextAlignment::BOTTOMRIGHT, Colors::WHITE,
std::to_string(iter.second.details->primskills[i]))); std::to_string(iter.second.details->primskills[i])));
} }
} }

3
client/windows/GUIClasses.h
View File

@ -502,7 +502,8 @@ class CThievesGuildWindow : public CStatusbarWindow
std::vector<std::shared_ptr<CPicture>> banners; std::vector<std::shared_ptr<CPicture>> banners;
std::vector<std::shared_ptr<CAnimImage>> bestHeroes; std::vector<std::shared_ptr<CAnimImage>> bestHeroes;
std::vector<std::shared_ptr<CTextBox>> primSkillHeaders; std::vector<std::shared_ptr<CLabel>> primSkillHeaders;
std::vector<std::shared_ptr<LRClickableArea>> primSkillHeadersArea;
std::vector<std::shared_ptr<CLabel>> primSkillValues; std::vector<std::shared_ptr<CLabel>> primSkillValues;
std::vector<std::shared_ptr<CAnimImage>> bestCreatures; std::vector<std::shared_ptr<CAnimImage>> bestCreatures;
std::vector<std::shared_ptr<CLabel>> personalities; std::vector<std::shared_ptr<CLabel>> personalities;