diff options
| -rw-r--r-- | src/object_gui.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/object_gui.cpp b/src/object_gui.cpp index 8e687b836..4c1a47aa6 100644 --- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -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; } |