|
|
|
@ -884,16 +884,10 @@ struct GenerateLandscapeWindow : public Window {
|
|
|
|
|
|
|
|
|
|
void OnTimeout() override
|
|
|
|
|
{
|
|
|
|
|
static const int newgame_raise_widgets[] = {WID_GL_START_DATE_DOWN, WID_GL_START_DATE_UP, WID_GL_SNOW_COVERAGE_UP, WID_GL_SNOW_COVERAGE_DOWN, WID_GL_DESERT_COVERAGE_UP, WID_GL_DESERT_COVERAGE_DOWN, WIDGET_LIST_END};
|
|
|
|
|
static const int heightmap_raise_widgets[] = {WID_GL_HEIGHTMAP_HEIGHT_DOWN, WID_GL_HEIGHTMAP_HEIGHT_UP, WID_GL_START_DATE_DOWN, WID_GL_START_DATE_UP, WID_GL_SNOW_COVERAGE_UP, WID_GL_SNOW_COVERAGE_DOWN, WID_GL_DESERT_COVERAGE_UP, WID_GL_DESERT_COVERAGE_DOWN, WIDGET_LIST_END};
|
|
|
|
|
|
|
|
|
|
const int *widget = (mode == GLWM_HEIGHTMAP) ? heightmap_raise_widgets : newgame_raise_widgets;
|
|
|
|
|
|
|
|
|
|
for (; *widget != WIDGET_LIST_END; widget++) {
|
|
|
|
|
if (this->IsWidgetLowered(*widget)) {
|
|
|
|
|
this->RaiseWidget(*widget);
|
|
|
|
|
this->SetWidgetDirty(*widget);
|
|
|
|
|
}
|
|
|
|
|
if (mode == GLWM_HEIGHTMAP) {
|
|
|
|
|
this->RaiseWidgetsWhenLowered(WID_GL_HEIGHTMAP_HEIGHT_DOWN, WID_GL_HEIGHTMAP_HEIGHT_UP, WID_GL_START_DATE_DOWN, WID_GL_START_DATE_UP, WID_GL_SNOW_COVERAGE_UP, WID_GL_SNOW_COVERAGE_DOWN, WID_GL_DESERT_COVERAGE_UP, WID_GL_DESERT_COVERAGE_DOWN);
|
|
|
|
|
} else {
|
|
|
|
|
this->RaiseWidgetsWhenLowered(WID_GL_START_DATE_DOWN, WID_GL_START_DATE_UP, WID_GL_SNOW_COVERAGE_UP, WID_GL_SNOW_COVERAGE_DOWN, WID_GL_DESERT_COVERAGE_UP, WID_GL_DESERT_COVERAGE_DOWN);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1232,13 +1226,7 @@ struct CreateScenarioWindow : public Window
|
|
|
|
|
|
|
|
|
|
void OnTimeout() override
|
|
|
|
|
{
|
|
|
|
|
static const int raise_widgets[] = {WID_CS_START_DATE_DOWN, WID_CS_START_DATE_UP, WID_CS_FLAT_LAND_HEIGHT_DOWN, WID_CS_FLAT_LAND_HEIGHT_UP, WIDGET_LIST_END};
|
|
|
|
|
for (const int *widget = raise_widgets; *widget != WIDGET_LIST_END; widget++) {
|
|
|
|
|
if (this->IsWidgetLowered(*widget)) {
|
|
|
|
|
this->RaiseWidget(*widget);
|
|
|
|
|
this->SetWidgetDirty(*widget);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this->RaiseWidgetsWhenLowered(WID_CS_START_DATE_DOWN, WID_CS_START_DATE_UP, WID_CS_FLAT_LAND_HEIGHT_DOWN, WID_CS_FLAT_LAND_HEIGHT_UP);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OnDropdownSelect(int widget, int index) override
|
|
|
|
|