mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Change ordering of UI elements in main menu to fix hota 1.7 menu
This commit is contained in:
parent
9a2d918360
commit
32ad9c1902
@ -80,6 +80,12 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
|
||||
|
||||
pos = background->center();
|
||||
|
||||
if(!config["video"].isNull())
|
||||
{
|
||||
Point videoPosition(config["video"]["x"].Integer(), config["video"]["y"].Integer());
|
||||
videoPlayer = std::make_shared<VideoWidget>(videoPosition, VideoPath::fromJson(config["video"]["name"]), false);
|
||||
}
|
||||
|
||||
for(const JsonNode & node : config["items"].Vector())
|
||||
menuNameToEntry.push_back(node["name"].String());
|
||||
|
||||
@ -90,12 +96,7 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
|
||||
menuNameToEntry.push_back("credits");
|
||||
|
||||
tabs = std::make_shared<CTabbedInt>(std::bind(&CMenuScreen::createTab, this, _1));
|
||||
if(!config["video"].isNull())
|
||||
{
|
||||
Point videoPosition(config["video"]["x"].Integer(), config["video"]["y"].Integer());
|
||||
videoPlayer = std::make_shared<VideoWidget>(videoPosition, VideoPath::fromJson(config["video"]["name"]), false);
|
||||
}
|
||||
else
|
||||
if(config["video"].isNull())
|
||||
tabs->setRedrawParent(true);
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user