cpp/openttd-patchpack/source Changeset - r19429:b80ef419deac

Changeset - r19429:b80ef419deac

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 12 years ago 2012-06-16 20:01:34
frosch@openttd.org

(svn r24346) -Fix: EQUALSIZE widget containers within EQUALSIZE containers were initialised with wrong sizes.

1 file changed with 22 insertions and 2 deletions:

src/widget.cpp

0 comments (0 inline, 0 general)

src/widget.cpp

➞

Show inline comments

@@ @@ -1153,7 +1153,17 @@ void NWidgetHorizontal::AssignSizePositi @@
+{
 	assert(given_width >= this->smallest_x && given_height >= this->smallest_y);
 	uint additional_length = given_width - this->smallest_x; // Additional width given to us.
 	/* Compute additional width given to us. */
 	uint additional_length = given_width;
 	if (sizing == ST_SMALLEST && (this->flags & NC_EQUALSIZE)) {
 		/* For EQUALSIZE containers this does not sum to smallest_x during initialisation */
 		for (NWidgetBase *child_wid = this->head; child_wid != NULL; child_wid = child_wid->next) {
 			additional_length -= child_wid->smallest_x + child_wid->padding_right + child_wid->padding_left;
+		}
 	} else {
 		additional_length -= this->smallest_x;
+	}
 	this->StoreSizePosition(sizing, x, y, given_width, given_height);
 	/* In principle, the additional horizontal space is distributed evenly over the available resizable childs. Due to step sizes, this may not always be feasible.
@@ @@ -1305,7 +1315,17 @@ void NWidgetVertical::AssignSizePosition @@
+{
 	assert(given_width >= this->smallest_x && given_height >= this->smallest_y);
 	int additional_length = given_height - this->smallest_y; // Additional height given to us.
 	/* Compute additional height given to us. */
 	uint additional_length = given_height;
 	if (sizing == ST_SMALLEST && (this->flags & NC_EQUALSIZE)) {
 		/* For EQUALSIZE containers this does not sum to smallest_y during initialisation */
 		for (NWidgetBase *child_wid = this->head; child_wid != NULL; child_wid = child_wid->next) {
 			additional_length -= child_wid->smallest_y + child_wid->padding_top + child_wid->padding_bottom;
+		}
 	} else {
 		additional_length -= this->smallest_y;
+	}
 	this->StoreSizePosition(sizing, x, y, given_width, given_height);
 	/* Like the horizontal container, the vertical container also distributes additional height evenly, starting with the childs with the biggest resize steps.

0 comments (0 inline, 0 general)