mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14786) -Fix: road/rail/water/airport toolbar opened over terraform toolbar when toolbar linking is turned on.

This commit is contained in:
rubidium 2009-01-02 21:01:13 +00:00
parent b3f2f40db7
commit 5b3a2ed2ab
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/terraform_gui.cpp
View File

@ -10,6 +10,7 @@
#include "company_base.h"
#include "gui.h"
#include "window_gui.h"
#include "window_func.h"
#include "viewport_func.h"
#include "gfx_func.h"
#include "command_func.h"
@ -328,16 +329,24 @@ static const WindowDesc _terraform_desc = {
void ShowTerraformToolbar(Window *link)
{
if (!IsValidCompanyID(_current_company)) return;
Window *w = AllocateWindowDescFront<TerraformToolbarWindow>(&_terraform_desc, 0);
if (w != NULL && link != NULL) {
/* Align the terraform toolbar under the main toolbar and put the linked
* toolbar to left of it
*/
if (link == NULL) return;
if (w == NULL) {
w = FindWindowById(WC_SCEN_LAND_GEN, 0);
} else {
w->top = 22;
w->SetDirty();
link->left = w->left - link->width;
link->SetDirty();
}
if (w == NULL) return;
/* Align the terraform toolbar under the main toolbar and put the linked
* toolbar to left of it
*/
link->top = w->top;
link->left = w->left - link->width;
link->SetDirty();
}
static byte _terraform_size = 1;