gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25540) -Fix: Unify selecting a new object class in the object GUI. (sbr)

Browse Source
This commit is contained in:
frosch 2013-06-30 14:37:50 +00:00
parent d798766f2e
commit 83a0174ef2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/object_gui.cpp
View File

@ -83,9 +83,9 @@ public:
NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX); NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL)); matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));
matrix->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
if (this->CanRestoreSelectedObject()) { if (this->CanRestoreSelectedObject()) {
this->SelectOtherClass(_selected_object_class),
this->SelectOtherObject(_selected_object_index); this->SelectOtherObject(_selected_object_index);
} else { } else {
this->SelectFirstAvailableObject(true); this->SelectFirstAvailableObject(true);
@ -328,6 +328,16 @@ public:
} }
} }
/**
* Select the specified object class.
* @param object_class_index Object class index to select.
*/
void SelectOtherClass(ObjectClassID object_class_index)
{
_selected_object_class = object_class_index;
this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX)->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
}
/** /**
* Select the specified object in #_selected_object_class class. * Select the specified object in #_selected_object_class class.
* @param object_index Object index to select, \c -1 means select nothing. * @param object_index Object index to select, \c -1 means select nothing.
@ -373,8 +383,7 @@ public:
int num_clicked = this->vscroll->GetPosition() + (pt.y - this->nested_array[widget]->pos_y) / this->line_height; int num_clicked = this->vscroll->GetPosition() + (pt.y - this->nested_array[widget]->pos_y) / this->line_height;
if (num_clicked >= (int)ObjectClass::GetUIClassCount()) break; if (num_clicked >= (int)ObjectClass::GetUIClassCount()) break;
_selected_object_class = ObjectClass::GetUIClass(num_clicked); this->SelectOtherClass(ObjectClass::GetUIClass(num_clicked));
this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX)->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
this->SelectFirstAvailableObject(false); this->SelectFirstAvailableObject(false);
break; break;
} }
@ -421,8 +430,7 @@ public:
for (uint i = 0; i < objclass->GetSpecCount(); i++) { for (uint i = 0; i < objclass->GetSpecCount(); i++) {
const ObjectSpec *spec = objclass->GetSpec(i); const ObjectSpec *spec = objclass->GetSpec(i);
if (spec->IsAvailable()) { if (spec->IsAvailable()) {
_selected_object_class = j; this->SelectOtherClass(j);
this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX)->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
this->SelectOtherObject(i); this->SelectOtherObject(i);
return; return;
} }
@ -434,7 +442,7 @@ public:
/* ... but make sure that the class is not empty. */ /* ... but make sure that the class is not empty. */
for (ObjectClassID j = OBJECT_CLASS_BEGIN; j < OBJECT_CLASS_MAX; j++) { for (ObjectClassID j = OBJECT_CLASS_BEGIN; j < OBJECT_CLASS_MAX; j++) {
if (ObjectClass::Get(j)->GetUISpecCount() > 0) { if (ObjectClass::Get(j)->GetUISpecCount() > 0) {
_selected_object_class = j; this->SelectOtherClass(j);
break; break;
} }
} }