games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Interface builder refactored

Browse Source
This commit is contained in:
nordsoft
2022-12-16 00:46:36 +04:00
parent 2fe951f819
commit 2371e3e9a2
4 changed files with 265 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
client/lobby/RandomMapTab.cpp
View File

@@ -100,9 +100,23 @@ RandomMapTab::RandomMapTab():
//new callbacks available only from mod
addCallback("templateSelection", [&](int)
{
GH.pushInt(std::make_shared<TemplatesDropBox>(this, int3{mapGenOptions->getWidth(), mapGenOptions->getHeight(), 1 + mapGenOptions->getHasTwoLevels()}));
GH.pushIntT<TemplatesDropBox>(this, int3{mapGenOptions->getWidth(), mapGenOptions->getHeight(), 1 + mapGenOptions->getHasTwoLevels()});
});
addCallback("teamAlignments", [&](int)
{
GH.pushIntT<TeamAlignmentsWidget>(this);
});
for(auto road : VLC->terrainTypeHandler->roads())
{
std::string cbRoadType = "selectRoad_" + road.fileName;
addCallback(cbRoadType, [&](bool on)
{
//TODO: support road types
});
}
init(config);
@@ -293,7 +307,7 @@ TemplatesDropBox::ListItem::ListItem(TemplatesDropBox * _dropBox, Point position
dropBox(_dropBox)
{
OBJ_CONSTRUCTION;
labelName = std::make_shared<CLabel>(0, 0, FONT_SMALL, EAlignment::TOPLEFT, Colors::WHITE);
labelName = std::make_shared<CLabel>(0, 0, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
labelName->setAutoRedraw(false);
hoverImage = std::make_shared<CPicture>("List10Sl", 0, 0);
@@ -352,6 +366,9 @@ TemplatesDropBox::TemplatesDropBox(RandomMapTab * randomMapTab, int3 size):
curItems.insert(curItems.begin(), nullptr); //default template
OBJ_CONSTRUCTION;
pos = randomMapTab->pos.topLeft();
pos.w = randomMapTab->pos.w;
pos.h = randomMapTab->pos.h;
background = std::make_shared<CPicture>("List10Bk", 158, 76);
int positionsToShow = 10;
@@ -362,7 +379,6 @@ TemplatesDropBox::TemplatesDropBox(RandomMapTab * randomMapTab, int3 size):
slider = std::make_shared<CSlider>(Point(212 + 158, 76), 252, std::bind(&TemplatesDropBox::sliderMove, this, _1), positionsToShow, (int)curItems.size(), 0, false, CSlider::BLUE);
updateListItems();
pos = background->pos;
}
void TemplatesDropBox::sliderMove(int slidPos)
@@ -410,3 +426,24 @@ void TemplatesDropBox::setTemplate(const CRmgTemplate * tmpl)
assert(GH.topInt().get() == this);
GH.popInt(GH.topInt());
}
TeamAlignmentsWidget::TeamAlignmentsWidget(RandomMapTab * randomMapTab):
CIntObject(),
randomMapTab(randomMapTab)
{
OBJ_CONSTRUCTION;
pos.w = 300;
pos.h = 300;
background = std::make_shared<CFilledTexture>("Bl3DCvex", pos);
center(pos);
buttonOk = std::make_shared<CButton>(Point(43, 240), "MUBCHCK.DEF", CGI->generaltexth->zelp[560], [](){});
buttonCancel = std::make_shared<CButton>(Point(193, 240), "MUBCANC.DEF", CGI->generaltexth->zelp[561], [&]()
{
assert(GH.topInt().get() == this);
GH.popInt(GH.topInt());
}, SDLK_ESCAPE);
}