diff options
| -rw-r--r-- | src/autoreplace_gui.cpp | 3 | ||||
| -rw-r--r-- | src/build_vehicle_gui.cpp | 3 | ||||
| -rw-r--r-- | src/window.cpp | 17 |
3 files changed, 5 insertions, 18 deletions
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 9b5adbfd6..7e1d78cb2 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -227,9 +227,6 @@ public: this->InitNested(desc, vehicletype); - /* Update the scrollbars/matrix 'definitions' */ - this->OnResize(); - this->owner = _local_company; this->sel_group = id_g; } diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 25b78867d..44818d309 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -837,9 +837,6 @@ struct BuildVehicleWindow : Window { this->FinishInitNested(desc, tile == INVALID_TILE ? (int)type : tile); - /* Update the scrollbars/matrix 'definitions' */ - this->OnResize(); - this->eng_list.ForceRebuild(); this->GenerateBuildList(); // generate the list, since we need it in the next line /* Select the first engine in the list as default when opening the window */ diff --git a/src/window.cpp b/src/window.cpp index 873bfa616..34a6b2bcd 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -517,17 +517,8 @@ 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 (dx == 0 && dy == 0) { // No resize needed. - this->SetDirty(); - if (this->viewport != NULL) { - NWidgetViewport *nvp = (NWidgetViewport *)nested_root->GetWidgetOfType(NWID_VIEWPORT); - nvp->UpdateViewportCoordinates(this); - } - return; - } - - ResizeWindow(this, dx, dy); // Sets post-resize dirty blocks. - this->OnResize(); // Calls NWidgetViewport::UpdateViewportCoordinates() + ResizeWindow(this, dx, dy); + this->OnResize(); } /** Find the Window whose parent pointer points to this window @@ -901,9 +892,11 @@ void Window::FindWindowPlacementAndResize(int def_width, int def_height) if (this->resize.step_height > 1) enlarge_y -= enlarge_y % (int)this->resize.step_height; ResizeWindow(this, enlarge_x, enlarge_y); - this->OnResize(); } + /* Always call OnResize; that way the scrollbars and matrices get initialized */ + this->OnResize(); + int nx = this->left; int ny = this->top; |