From df732f2bae50510799e072ed10ac658711ed4907 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 30 Jun 2013 14:34:23 +0000 Subject: [PATCH] (svn r25534) -Codechange: FinishInitNested calls OnResize, no need to setup scrollbar capacity before that. --- src/network/network_gui.cpp | 1 - src/object_gui.cpp | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 1760030bbf..e4af9d5b9a 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1354,7 +1354,6 @@ struct NetworkLobbyWindow : public Window { this->CreateNestedTree(); this->vscroll = this->GetScrollbar(WID_NL_SCROLLBAR); this->FinishInitNested(WN_NETWORK_WINDOW_LOBBY); - this->OnResize(); } CompanyID NetworkLobbyFindCompanyIndex(byte pos) const diff --git a/src/object_gui.cpp b/src/object_gui.cpp index b27388313d..e4287c7aca 100644 --- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -75,14 +75,12 @@ public: BuildObjectWindow(WindowDesc *desc, Window *w) : PickerWindowBase(desc, w), info_height(1) { this->CreateNestedTree(); - this->vscroll = this->GetScrollbar(WID_BO_SCROLLBAR); - this->vscroll->SetCapacity(5); + this->FinishInitNested(0); + this->vscroll->SetPosition(0); this->vscroll->SetCount(ObjectClass::GetUIClassCount()); - this->FinishInitNested(0); - if (this->CanRestoreSelectedObject()) { this->SelectOtherObject(_selected_object_index); } else {