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

(svn r25539) -Codechange: Setup object GUI matrix before restoring selected object, so that the matrix state can be properly set. (sbr)

Browse Source
This commit is contained in:
frosch
2013-06-30 14:37:24 +00:00
parent 17132a6a6f
commit b74f06bd32
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/object_gui.cpp
View File

@@ -81,6 +81,10 @@ public:
this->vscroll->SetPosition(0);
this->vscroll->SetCount(ObjectClass::GetUIClassCount());
NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));
matrix->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
if (this->CanRestoreSelectedObject()) {
this->SelectOtherObject(_selected_object_index);
} else {
@@ -90,10 +94,6 @@ public:
this->EnsureSelectedObjectClassIsVisible();
this->GetWidget<NWidgetMatrix>(WID_BO_OBJECT_MATRIX)->SetCount(4);
NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));
matrix->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
/* If needed restore the window previous size with the stored values.*/
uint default_num_cols = this->GetMatrixColumnCount();
uint default_num_rows = this->vscroll->GetCapacity();
@@ -106,8 +106,6 @@ public:
* matrix columns are visible. */
this->FindWindowPlacementAndResize(this->width, this->height);
}
if (_selected_object_index != -1) matrix->SetClicked(ObjectClass::Get(_selected_object_class)->GetUIFromIndex(_selected_object_index));
}
virtual ~BuildObjectWindow()
@@ -424,6 +422,7 @@ public:
const ObjectSpec *spec = objclass->GetSpec(i);
if (spec->IsAvailable()) {
_selected_object_class = j;
this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX)->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
this->SelectOtherObject(i);
return;
}