petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r17915) -Codechange: Allow windows to compute their own initial position.

Browse Source
This commit is contained in:
alberth
2009-10-31 11:34:43 +00:00
parent 52b2d67200
commit 82e21df3a4
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/window.cpp
View File

@@ -1310,6 +1310,11 @@ static Point LocalGetWindowPlacement(const WindowDesc *desc, int16 sm_width, int
return pt; return pt;
} }
/* virtual */ Point Window::OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
{
return LocalGetWindowPlacement(desc, sm_width, sm_height, window_number);
}
/** /**
* Set the positions of a new window from a WindowDesc and open it. * Set the positions of a new window from a WindowDesc and open it.
* *
@@ -1356,7 +1361,7 @@ void Window::FinishInitNested(const WindowDesc *desc, WindowNumber window_number
{ {
this->InitializeData(desc->cls, NULL, window_number); this->InitializeData(desc->cls, NULL, window_number);
this->desc_flags = desc->flags; this->desc_flags = desc->flags;
Point pt = LocalGetWindowPlacement(desc, this->nested_root->smallest_x, this->nested_root->smallest_y, window_number); Point pt = this->OnInitialPosition(desc, this->nested_root->smallest_x, this->nested_root->smallest_y, window_number);
this->InitializePositionSize(pt.x, pt.y, this->nested_root->smallest_x, this->nested_root->smallest_y); this->InitializePositionSize(pt.x, pt.y, this->nested_root->smallest_x, this->nested_root->smallest_y);
this->FindWindowPlacementAndResize(desc->default_width, desc->default_height); this->FindWindowPlacementAndResize(desc->default_width, desc->default_height);
} }

12
src/window_gui.h
View File

@@ -638,6 +638,18 @@ public:
/*** Event handling ***/ /*** Event handling ***/
/**
* Compute the initial position of the window.
* @param *desc The pointer to the WindowDesc of the window to create.
* @param sm_width Smallest width of the window.
* @param sm_height Smallest height of the window.
* @param window_number The window number of the new window.
* @return Initial position of the top-left corner of the window.
*
* @note Due to the way C++ works, only windows with nested widgets can usefully override this function.
*/
virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number);
/** /**
* The window must be repainted. * The window must be repainted.
* @note This method should not change any state, it should only use drawing functions. * @note This method should not change any state, it should only use drawing functions.