|
@@ -937,13 +937,13 @@ public:
|
|
|
if (!this->IsButton(child_wid->type)) {
|
|
|
child_wid->current_x = child_wid->smallest_x;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool allow_resize_x, bool allow_resize_y, bool rtl)
|
|
|
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl)
|
|
|
{
|
|
|
assert(given_width >= this->smallest_x && given_height >= this->smallest_y);
|
|
|
|
|
|
this->pos_x = x;
|
|
|
this->pos_y = y;
|
|
|
this->current_x = given_width;
|
|
@@ -989,13 +989,13 @@ public:
|
|
|
/* Buttons can be scaled, the others not. */
|
|
|
if (this->IsButton(child_wid->type)) {
|
|
|
child_wid->current_x = button_space / (button_count - button_i);
|
|
|
button_space -= child_wid->current_x;
|
|
|
button_i++;
|
|
|
}
|
|
|
child_wid->AssignSizePosition(sizing, x + position, y, child_wid->current_x, this->current_y, allow_resize_x, (this->resize_y > 0), rtl);
|
|
|
child_wid->AssignSizePosition(sizing, x + position, y, child_wid->current_x, this->current_y, rtl);
|
|
|
position += child_wid->current_x;
|
|
|
|
|
|
if (rtl) {
|
|
|
cur_wid--;
|
|
|
} else {
|
|
|
cur_wid++;
|