Merge branch 'master' into jgrpp

# Conflicts:
#	src/widget.cpp
This commit is contained in:
Jonathan G Rennison
2023-12-29 16:29:45 +00:00
14 changed files with 63 additions and 91 deletions

View File

@@ -336,7 +336,7 @@ public:
this->querystrings[WID_SL_SAVE_OSK_TITLE] = &this->filename_editbox;
this->filename_editbox.ok_button = WID_SL_SAVE_GAME;
this->CreateNestedTree(true);
this->CreateNestedTree();
if (this->fop == SLO_LOAD && this->abstract_filetype == FT_SAVEGAME) {
this->GetWidget<NWidgetStacked>(WID_SL_CONTENT_DOWNLOAD_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
}