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

Merge branch 'group_collapse' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-01-21 02:32:43 +00:00
parent 24b3424ca3 a0fe6c3c3f
commit da058213e6
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/group_gui.cpp
View File

@@ -148,6 +148,7 @@ private:
GUIGroupList groups; ///< List of groups
uint tiny_step_height; ///< Step height for the group list
Scrollbar *group_sb;
SmallVector<GroupID, 16> all_groups; ///< List of all groups, including hidden ones
SmallVector<GroupID, 16> collapsed_groups; ///< List of collapsed groups
SmallVector<GroupID, 16> collapsable_groups; ///< List of collapsable groups
@@ -156,18 +157,21 @@ private:
Dimension column_size[VGC_END]; ///< Size of the columns in the group list.
/** return true if group has children */
bool AddParents(GUIGroupList *source, GroupID parent, int indent)
bool AddParents(GUIGroupList *source, GroupID parent, int indent, bool parent_collapsed)
{
bool is_collapsed = this->collapsed_groups.Contains(parent);
bool overall_collapsed = is_collapsed || parent_collapsed;
bool has_children = false;
for (const Group **g = source->Begin(); g != source->End(); g++) {
if ((*g)->parent == parent) {
has_children = true;
if (is_collapsed) return has_children;
*this->groups.Append() = *g;
*this->indents.Append() = indent;
bool child_has_children = AddParents(source, (*g)->index, indent + 1);
*this->all_groups.Append() = (*g)->index;
if (!overall_collapsed) {
*this->groups.Append() = *g;
*this->indents.Append() = indent;
}
bool child_has_children = AddParents(source, (*g)->index, indent + 1, overall_collapsed);
if (child_has_children) *this->collapsable_groups.Append() = (*g)->index;
}
}
@@ -178,7 +182,9 @@ private:
{
GroupID *item = this->collapsed_groups.Find(group);
if (item == this->collapsed_groups.End()) {
*(this->collapsed_groups.Append()) = group;
if (this->collapsable_groups.Find(group) != this->collapsable_groups.End()) {
*(this->collapsed_groups.Append()) = group;
}
} else {
this->collapsed_groups.Erase(item);
}
@@ -193,6 +199,7 @@ private:
{
if (!this->groups.NeedRebuild()) return;
this->all_groups.Clear();
this->groups.Clear();
this->indents.Clear();
this->collapsable_groups.Clear();
@@ -209,7 +216,7 @@ private:
list.ForceResort();
list.Sort(&GroupNameSorter);
AddParents(&list, INVALID_GROUP, 0);
AddParents(&list, INVALID_GROUP, 0, false);
this->groups.Compact();
this->groups.RebuildDone();
@@ -769,8 +776,8 @@ public:
case WID_GL_COLLAPSE_ALL_GROUPS: {
this->collapsed_groups.Clear();
for (const Group **group = this->groups.Begin(); group != this->groups.End(); ++group) {
GroupID id = (*group)->index;
for (const GroupID *gid = this->all_groups.Begin(); gid != this->all_groups.End(); ++gid) {
GroupID id = *gid;
if (id != ALL_GROUP && id != DEFAULT_GROUP && id != INVALID_GROUP && this->collapsable_groups.Contains(id)) {
*this->collapsed_groups.Append() = id;
}