mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18345) -Codechange: Warn the window that it gets initialized, so it can do some work ahead.

release/1.0
alberth 2009-11-29 21:14:34 +00:00
parent 8a8bf6c53d
commit 5187a5980b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/window.cpp
View File

@ -491,6 +491,7 @@ void Window::ReInit(int rx, int ry)
int window_width = this->width; int window_width = this->width;
int window_height = this->height; int window_height = this->height;
this->OnInit();
/* Re-initialize the window from the ground up. No need to change the nested_array, as all widgets stay where they are. */ /* Re-initialize the window from the ground up. No need to change the nested_array, as all widgets stay where they are. */
this->nested_root->SetupSmallestSize(this, false); this->nested_root->SetupSmallestSize(this, false);
this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, _dynlang.text_dir == TD_RTL); this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, _dynlang.text_dir == TD_RTL);
@ -786,7 +787,8 @@ void Window::InitializeData(WindowClass cls, int window_number, uint32 desc_flag
this->window_number = window_number; this->window_number = window_number;
this->desc_flags = desc_flags; this->desc_flags = desc_flags;
/* If available, initialize nested widget tree. */ this->OnInit();
/* Initialize nested widget tree. */
if (this->nested_array == NULL) { if (this->nested_array == NULL) {
this->nested_array = CallocT<NWidgetBase *>(this->nested_array_size); this->nested_array = CallocT<NWidgetBase *>(this->nested_array_size);
this->nested_root->SetupSmallestSize(this, true); this->nested_root->SetupSmallestSize(this, true);

6
src/window_gui.h
View File

@ -534,6 +534,12 @@ public:
/*** Event handling ***/ /*** Event handling ***/
/**
* Notification that the nested widget tree gets initialized. The event can be used to perform general computations.
* @note #nested_root and/or #nested_array (normally accessed via #GetWidget()) may not exist during this call.
*/
virtual void OnInit() { }
/** /**
* Compute the initial position of the window. * Compute the initial position of the window.
* @param *desc The pointer to the WindowDesc of the window to create. * @param *desc The pointer to the WindowDesc of the window to create.