|
|
|
@ -606,13 +606,13 @@ public:
|
|
|
|
|
|
|
|
|
|
case WID_GL_LIST_GROUP: {
|
|
|
|
|
int y1 = r.top;
|
|
|
|
|
int max = std::min<size_t>(this->group_sb->GetPosition() + this->group_sb->GetCapacity(), this->groups.size());
|
|
|
|
|
for (int i = this->group_sb->GetPosition(); i < max; ++i) {
|
|
|
|
|
size_t max = std::min<size_t>(this->group_sb->GetPosition() + this->group_sb->GetCapacity(), this->groups.size());
|
|
|
|
|
for (size_t i = this->group_sb->GetPosition(); i < max; ++i) {
|
|
|
|
|
const Group *g = this->groups[i];
|
|
|
|
|
|
|
|
|
|
assert(g->owner == this->owner);
|
|
|
|
|
|
|
|
|
|
DrawGroupInfo(y1, r.left, r.right, g->index, this->indents[i] * WidgetDimensions::scaled.hsep_indent, HasBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION), g->folded || (i + 1 < (int)this->groups.size() && indents[i + 1] > this->indents[i]));
|
|
|
|
|
DrawGroupInfo(y1, r.left, r.right, g->index, this->indents[i] * WidgetDimensions::scaled.hsep_indent, HasBit(g->flags, GroupFlags::GF_REPLACE_PROTECTION), g->folded || (i + 1 < this->groups.size() && indents[i + 1] > this->indents[i]));
|
|
|
|
|
|
|
|
|
|
y1 += this->tiny_step_height;
|
|
|
|
|
}
|
|
|
|
@ -630,8 +630,8 @@ public:
|
|
|
|
|
if (this->vli.index != ALL_GROUP && this->grouping == GB_NONE) {
|
|
|
|
|
/* Mark vehicles which are in sub-groups (only if we are not using shared order coalescing) */
|
|
|
|
|
Rect mr = r.WithHeight(this->resize.step_height);
|
|
|
|
|
uint max = static_cast<uint>(std::min<size_t>(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->vehgroups.size()));
|
|
|
|
|
for (uint i = this->vscroll->GetPosition(); i < max; ++i) {
|
|
|
|
|
size_t max = std::min<size_t>(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->vehgroups.size());
|
|
|
|
|
for (size_t i = this->vscroll->GetPosition(); i < max; ++i) {
|
|
|
|
|
const Vehicle *v = this->vehgroups[i].GetSingleVehicle();
|
|
|
|
|
if (v->group_id != this->vli.index) {
|
|
|
|
|
GfxFillRect(mr.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[COLOUR_GREY][3], FILLRECT_CHECKER);
|
|
|
|
|