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

(svn r18013) -Codechange: Add possibility to change window size during ReInit().

release/1.0
alberth 2009-11-08 15:22:04 +00:00
parent 4c06a9e549
commit a2e6035f16
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/window.cpp
View File

@ -599,8 +599,12 @@ void Window::SetDirty() const
SetDirtyBlocks(this->left, this->top, this->left + this->width, this->top + this->height);
}
/** Re-initialize a window. */
void Window::ReInit()
/** Re-initialize a window, and optionally change its size.
* @param rx Horizontal resize of the window.
* @param ry Vertical resize of the window.
* @note For just resizing the window, use #ResizeWindow instead.
*/
void Window::ReInit(int rx, int ry)
{
if (this->nested_root == NULL) return; // Only nested widget windows can re-initialize.
@ -620,9 +624,9 @@ void Window::ReInit()
this->resize.step_width = this->nested_root->resize_x;
this->resize.step_height = this->nested_root->resize_y;
/* Resize as close to the original size as possible. */
window_width = max(window_width, this->width);
window_height = max(window_height, this->height);
/* Resize as close to the original size + requested resize as possible. */
window_width = max(window_width + rx, this->width);
window_height = max(window_height + ry, this->height);
int dx = (this->resize.step_width == 0) ? 0 : window_width - this->width;
int dy = (this->resize.step_height == 0) ? 0 : window_height - this->height;
/* dx and dy has to go by step.. calculate it.

2
src/window_gui.h
View File

@ -598,7 +598,7 @@ public:
void DeleteChildWindows(WindowClass wc = WC_INVALID) const;
void SetDirty() const;
void ReInit();
void ReInit(int rx = 0, int ry = 0);
/**
* Mark this window's data as invalid (in need of re-computing)