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

Re-add removed group collapse/expand all buttons

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-07-03 18:16:25 +01:00
parent 85e9a0195d
commit 91c5dee66c
5 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/group_gui.cpp
View File

@@ -68,6 +68,10 @@ static const NWidgetPart _nested_group_widgets[] = {
SetDataTip(SPR_GROUP_RENAME_TRAIN, STR_GROUP_RENAME_TOOLTIP),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_GL_LIVERY_GROUP), SetFill(0, 1),
SetDataTip(SPR_GROUP_LIVERY_TRAIN, STR_GROUP_LIVERY_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GL_COLLAPSE_ALL_GROUPS), SetFill(0, 1),
SetDataTip(STR_GROUP_COLLAPSE_ALL, STR_GROUP_COLLAPSE_ALL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GL_EXPAND_ALL_GROUPS), SetFill(0, 1),
SetDataTip(STR_GROUP_EXPAND_ALL, STR_GROUP_EXPAND_ALL),
NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), EndContainer(),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_GL_REPLACE_PROTECTION), SetFill(0, 1),
SetDataTip(SPR_GROUP_REPLACE_OFF_TRAIN, STR_GROUP_REPLACE_PROTECTION_TOOLTIP),
@@ -185,13 +189,26 @@ private:
GUIGroupList list;
bool enable_expand_all = false;
bool enable_collapse_all = false;
const Group *g;
FOR_ALL_GROUPS(g) {
if (g->owner == owner && g->vehicle_type == this->vli.vtype) {
list.push_back(g);
if (g->parent != INVALID_GROUP) {
if (Group::Get(g->parent)->folded) {
enable_expand_all = true;
} else {
enable_collapse_all = true;
}
}
}
}
this->SetWidgetDisabledState(WID_GL_EXPAND_ALL_GROUPS, !enable_expand_all);
this->SetWidgetDisabledState(WID_GL_COLLAPSE_ALL_GROUPS, !enable_collapse_all);
list.ForceResort();
list.Sort(&GroupNameSorter);
@@ -344,6 +361,20 @@ private:
}
}
void SetAllGroupsFoldState(bool folded)
{
const Group *g;
FOR_ALL_GROUPS(g) {
if (g->owner == this->owner && g->vehicle_type == this->vli.vtype) {
if (g->parent != INVALID_GROUP) {
Group::Get(g->parent)->folded = folded;
}
}
}
this->groups.ForceRebuild();
this->SetDirty();
}
public:
VehicleGroupWindow(WindowDesc *desc, WindowNumber window_number) : BaseVehicleListWindow(desc, window_number)
{
@@ -780,6 +811,17 @@ public:
this->ShowRenameGroupWindow(this->vli.index, false);
break;
case WID_GL_COLLAPSE_ALL_GROUPS: {
this->SetAllGroupsFoldState(true);
break;
}
case WID_GL_EXPAND_ALL_GROUPS: {
this->SetAllGroupsFoldState(false);
break;
}
case WID_GL_LIVERY_GROUP: // Set group livery
ShowCompanyLiveryWindow(this->owner, this->vli.index);
break;