games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

bigger line for folder

Browse Source
This commit is contained in:
Michael 2023-08-10 23:37:19 +02:00 committed by GitHub
parent f24c636d17
commit 48747eea9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Mods/vcmi/Sprites/mapFormatIcons/folder.png → Mods/vcmi/Data/lobby/iconFolder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Mods/vcmi/Data/lobby/selectionEmptyLine.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

3
Mods/vcmi/Sprites/ScSelC.json
View File

@ -2,7 +2,6 @@
"basepath" : "mapFormatIcons/",
"images" :
[
{ "frame" : 3, "file" : "vcmi1.png"},
{ "frame" : 99, "file" : "folder.png"}
{ "frame" : 3, "file" : "vcmi1.png"}
]
}

13
client/lobby/SelectionTab.cpp
View File

@ -788,6 +788,7 @@ SelectionTab::ListItem::ListItem(Point position, std::shared_ptr<CAnimation> ico
: CIntObject(LCLICK, position)
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
pictureEmptyLine = std::make_shared<CPicture>("lobby/selectionEmptyLine.png", -8, -14);
labelName = std::make_shared<CLabel>(184, 0, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE);
labelName->setAutoRedraw(false);
labelAmountOfPlayers = std::make_shared<CLabel>(8, 0, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE);
@ -797,6 +798,7 @@ SelectionTab::ListItem::ListItem(Point position, std::shared_ptr<CAnimation> ico
labelMapSizeLetter = std::make_shared<CLabel>(41, 0, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE);
labelMapSizeLetter->setAutoRedraw(false);
// FIXME: This -12 should not be needed, but for some reason CAnimImage displaced otherwise
iconFolder = std::make_shared<CPicture>("lobby/iconFolder.png", -8, -12);
iconFormat = std::make_shared<CAnimImage>(iconsFormats, 0, 0, 59, -12);
iconVictoryCondition = std::make_shared<CAnimImage>(iconsVictory, 0, 0, 277, -12);
iconLossCondition = std::make_shared<CAnimImage>(iconsLoss, 0, 0, 310, -12);
@ -808,6 +810,8 @@ void SelectionTab::ListItem::updateItem(std::shared_ptr<ElementInfo> info, bool
{
labelAmountOfPlayers->disable();
labelMapSizeLetter->disable();
iconFolder->disable();
pictureEmptyLine->disable();
iconFormat->disable();
iconVictoryCondition->disable();
iconLossCondition->disable();
@ -821,8 +825,9 @@ void SelectionTab::ListItem::updateItem(std::shared_ptr<ElementInfo> info, bool
{
labelAmountOfPlayers->disable();
labelMapSizeLetter->disable();
iconFormat->enable();
iconFormat->setFrame(99);
iconFolder->enable();
pictureEmptyLine->enable();
iconFormat->disable();
iconVictoryCondition->disable();
iconLossCondition->disable();
labelNumberOfCampaignMaps->disable();
@ -836,6 +841,8 @@ void SelectionTab::ListItem::updateItem(std::shared_ptr<ElementInfo> info, bool
{
labelAmountOfPlayers->disable();
labelMapSizeLetter->disable();
iconFolder->disable();
pictureEmptyLine->disable();
iconFormat->disable();
iconVictoryCondition->disable();
iconLossCondition->disable();
@ -856,6 +863,8 @@ void SelectionTab::ListItem::updateItem(std::shared_ptr<ElementInfo> info, bool
labelMapSizeLetter->enable();
labelMapSizeLetter->setText(info->getMapSizeName());
labelMapSizeLetter->setColor(color);
iconFolder->disable();
pictureEmptyLine->disable();
iconFormat->enable();
iconFormat->setFrame(info->getMapSizeFormatIconId());
iconVictoryCondition->enable();

2
client/lobby/SelectionTab.h
View File

@ -45,9 +45,11 @@ class SelectionTab : public CIntObject
std::shared_ptr<CLabel> labelAmountOfPlayers;
std::shared_ptr<CLabel> labelNumberOfCampaignMaps;
std::shared_ptr<CLabel> labelMapSizeLetter;
std::shared_ptr<CPicture> iconFolder;
std::shared_ptr<CAnimImage> iconFormat;
std::shared_ptr<CAnimImage> iconVictoryCondition;
std::shared_ptr<CAnimImage> iconLossCondition;
std::shared_ptr<CPicture> pictureEmptyLine;
std::shared_ptr<CLabel> labelName;
ListItem(Point position, std::shared_ptr<CAnimation> iconsFormats, std::shared_ptr<CAnimation> iconsVictory, std::shared_ptr<CAnimation> iconsLoss);