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

(svn r25534) -Codechange: FinishInitNested calls OnResize, no need to setup scrollbar capacity before that.

release/1.4
frosch 2013-06-30 14:34:23 +00:00
parent e184b9799c
commit df732f2bae
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/network_gui.cpp
View File

@ -1354,7 +1354,6 @@ struct NetworkLobbyWindow : public Window {
this->CreateNestedTree(); this->CreateNestedTree();
this->vscroll = this->GetScrollbar(WID_NL_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_NL_SCROLLBAR);
this->FinishInitNested(WN_NETWORK_WINDOW_LOBBY); this->FinishInitNested(WN_NETWORK_WINDOW_LOBBY);
this->OnResize();
} }
CompanyID NetworkLobbyFindCompanyIndex(byte pos) const CompanyID NetworkLobbyFindCompanyIndex(byte pos) const

6
src/object_gui.cpp
View File

@ -75,14 +75,12 @@ public:
BuildObjectWindow(WindowDesc *desc, Window *w) : PickerWindowBase(desc, w), info_height(1) BuildObjectWindow(WindowDesc *desc, Window *w) : PickerWindowBase(desc, w), info_height(1)
{ {
this->CreateNestedTree(); this->CreateNestedTree();
this->vscroll = this->GetScrollbar(WID_BO_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_BO_SCROLLBAR);
this->vscroll->SetCapacity(5); this->FinishInitNested(0);
this->vscroll->SetPosition(0); this->vscroll->SetPosition(0);
this->vscroll->SetCount(ObjectClass::GetUIClassCount()); this->vscroll->SetCount(ObjectClass::GetUIClassCount());
this->FinishInitNested(0);
if (this->CanRestoreSelectedObject()) { if (this->CanRestoreSelectedObject()) {
this->SelectOtherObject(_selected_object_index); this->SelectOtherObject(_selected_object_index);
} else { } else {