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

code review

Browse Source
This commit is contained in:
Michael
2023-08-20 14:14:47 +02:00
committed by GitHub
parent 1d94536299
commit e3a4c65100
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/lobby/SelectionTab.cpp
View File

@ -807,7 +807,7 @@ SelectionTab::CMapInfoTooltipBox::CMapInfoTooltipBox(std::string text, ResourceI
: CWindowObject(BORDERED | RCLICK_POPUP) : CWindowObject(BORDERED | RCLICK_POPUP)
{ {
drawPlayerElements = tabType == ESelectionScreen::newGame; drawPlayerElements = tabType == ESelectionScreen::newGame;
renderImage = tabType == ESelectionScreen::newGame; renderImage = tabType == ESelectionScreen::newGame && settings["lobby"]["mapPreview"].Bool();
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE; OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
@ -819,9 +819,12 @@ SelectionTab::CMapInfoTooltipBox::CMapInfoTooltipBox(std::string text, ResourceI
if(renderImage && mapLayerImages.size() > 1) if(renderImage && mapLayerImages.size() > 1)
pos.w += IMAGE_SIZE + BORDER; pos.w += IMAGE_SIZE + BORDER;
auto drawLabel = [&]() {
label = std::make_shared<CTextBox>(text, Rect(BORDER, BORDER, pos.w - 2 * BORDER, 350), 0, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE); label = std::make_shared<CTextBox>(text, Rect(BORDER, BORDER, pos.w - 2 * BORDER, 350), 0, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE);
if(!label->slider) if(!label->slider)
label->resize(label->label->textSize); label->resize(label->label->textSize);
};
drawLabel();
pos.h = BORDER + label->label->textSize.y + BORDER; pos.h = BORDER + label->label->textSize.y + BORDER;
if(renderImage) if(renderImage)
@ -829,10 +832,7 @@ SelectionTab::CMapInfoTooltipBox::CMapInfoTooltipBox(std::string text, ResourceI
backgroundTexture = std::make_shared<CFilledTexture>("DIBOXBCK", pos); backgroundTexture = std::make_shared<CFilledTexture>("DIBOXBCK", pos);
updateShadow(); updateShadow();
// TODO: hacky redraw drawLabel();
label = std::make_shared<CTextBox>(text, Rect(BORDER, BORDER, pos.w-2*BORDER, 350), 0, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE);
if(!label->slider)
label->resize(label->label->textSize);
if(renderImage) if(renderImage)
{ {

14
config/schemas/settings.json
View File

@ -3,7 +3,7 @@
{ {
"type" : "object", "type" : "object",
"$schema" : "http://json-schema.org/draft-04/schema", "$schema" : "http://json-schema.org/draft-04/schema",
"required" : [ "general", "video", "adventure", "battle", "input", "server", "logging", "launcher", "gameTweaks" ], "required" : [ "general", "video", "adventure", "battle", "input", "server", "logging", "launcher", "lobby", "gameTweaks" ],
"definitions" : { "definitions" : {
"logLevelEnum" : { "logLevelEnum" : {
"type" : "string", "type" : "string",
@ -526,6 +526,18 @@
} }
} }
}, },
"lobby" : {
"type" : "object",
"additionalProperties" : false,
"default" : {},
"required" : [ "mapPreview" ],
"properties" : {
"mapPreview" : {
"type" : "boolean",
"default" : true
}
}
},
"gameTweaks" : { "gameTweaks" : {
"type" : "object", "type" : "object",
"default" : {}, "default" : {},