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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/base_media_func.h
#	src/cargopacket.h
#	src/gfxinit.cpp
#	src/industry_cmd.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2023-05-26 20:08:05 +01:00
parent 42b3c5fe25 1697dff744
commit b381a30d2d
90 changed files with 382 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.cpp
View File

@@ -1028,9 +1028,10 @@ void Window::SetDirtyAsBlocks()
* Re-initialize a window, and optionally change its size.
* @param rx Horizontal resize of the window.
* @param ry Vertical resize of the window.
* @param reposition If set, reposition the window to default location.
* @note For just resizing the window, use #ResizeWindow instead.
*/
void Window::ReInit(int rx, int ry)
void Window::ReInit(int rx, int ry, bool reposition)
{
this->SetDirtyAsBlocks(); // Mark whole current window as dirty.
@@ -1057,6 +1058,12 @@ void Window::ReInit(int rx, int ry)
if (this->resize.step_width > 1) dx -= dx % (int)this->resize.step_width;
if (this->resize.step_height > 1) dy -= dy % (int)this->resize.step_height;
if (reposition) {
Point pt = this->OnInitialPosition(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->FindWindowPlacementAndResize(this->window_desc->GetDefaultWidth(), this->window_desc->GetDefaultHeight());
}
ResizeWindow(this, dx, dy);
/* ResizeWindow() does this->SetDirty() already, no need to do it again here. */
}