dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16497) -Feature [FS#2870]: Q/W/E/D will now open the landscape toolbar and select appropriate tool

Browse Source
This commit is contained in:
smatz
2009-06-01 14:36:36 +00:00
parent 1a506f5912
commit da57fe63f3
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/terraform_gui.cpp
View File

@@ -350,20 +350,20 @@ static const WindowDesc _terraform_desc(
_terraform_widgets, _nested_terraform_widgets, lengthof(_nested_terraform_widgets)
);
void ShowTerraformToolbar(Window *link)
Window *ShowTerraformToolbar(Window *link)
{
if (!Company::IsValidID(_local_company)) return;
if (!Company::IsValidID(_local_company)) return NULL;
Window *w = AllocateWindowDescFront<TerraformToolbarWindow>(&_terraform_desc, 0);
if (link == NULL) return;
if (link == NULL) return w;
if (w == NULL) {
w = FindWindowById(WC_SCEN_LAND_GEN, 0);
if (w == NULL) return NULL;
} else {
w->top = 22;
w->SetDirty();
}
if (w == NULL) return;
/* Align the terraform toolbar under the main toolbar and put the linked
* toolbar to left of it
@@ -371,6 +371,18 @@ void ShowTerraformToolbar(Window *link)
link->top = w->top;
link->left = w->left - link->width;
link->SetDirty();
return w;
}
void ShowTerraformToolbarWithTool(uint16 key, uint16 keycode)
{
Window *w = FindWindowById(WC_SCEN_LAND_GEN, 0);
if (w == NULL) w = ShowTerraformToolbar(NULL);
if (w == NULL) return;
w->OnKeyPress(key, keycode);
}
static byte _terraform_size = 1;
@@ -774,7 +786,17 @@ static const WindowDesc _scen_edit_land_gen_desc(
_scen_edit_land_gen_widgets, _nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets)
);
void ShowEditorTerraformToolbar()
Window *ShowEditorTerraformToolbar()
{
AllocateWindowDescFront<ScenarioEditorLandscapeGenerationWindow>(&_scen_edit_land_gen_desc, 0);
return AllocateWindowDescFront<ScenarioEditorLandscapeGenerationWindow>(&_scen_edit_land_gen_desc, 0);
}
void ShowEditorTerraformToolbarWithTool(uint16 key, uint16 keycode)
{
Window *w = FindWindowById(WC_SCEN_LAND_GEN, 0);
if (w == NULL) w = ShowEditorTerraformToolbar();
if (w == NULL) return;
w->OnKeyPress(key, keycode);
}