cpp/openttd-patchpack/source Changeset - r13311:815ca89c5b47

Changeset - r13311:815ca89c5b47

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 15 years ago 2009-10-20 21:25:25
frosch@openttd.org

(svn r17830) -Fix [FS#3276]: Some windows already need their window_number when setting up smallest size (e.g. for DParams). So assign it earlier in Window::InitializeData instead of dealing with each window separately.

3 files changed with 11 insertions and 12 deletions:

src/autoreplace_gui.cpp

src/depot_gui.cpp

src/window.cpp

0 comments (0 inline, 0 general)

src/autoreplace_gui.cpp

➞

Show inline comments

@@ @@ -206,7 +206,6 @@ public: @@
 		this->sel_engine[0] = INVALID_ENGINE;
 		this->sel_engine[1] = INVALID_ENGINE;
 		this->window_number = vehicletype;
 		this->InitNested(desc, vehicletype);
 		this->vscroll.SetCapacity(this->GetWidget<NWidgetBase>(RVW_WIDGET_LEFT_MATRIX)->current_y / this->resize.step_height);

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -230,11 +230,9 @@ struct DepotWindow : Window { @@
 		this->type = type;
 		this->CreateNestedTree(desc);
 		this->SetupWidgetData(type);
 		this->FinishInitNested(desc, tile);
 		this->window_number = tile;
 		this->SetupWidgetData(type);
 		this->FinishInitNested(desc, tile);
 		this->owner = GetTileOwner(tile);
 		this->CreateDepotListWindow(type);
+	}

src/window.cpp

➞

Show inline comments

@@ @@ -917,6 +917,14 @@ static void AssignWidgetToWindow(Window @@
  */
 void Window::InitializeData(WindowClass cls, const Widget *widget, int window_number)
+{
 	/* Set up window properties; some of them are needed to set up smallest size below */
 	this->window_class = cls;
 	this->flags4 = WF_WHITE_BORDER_MASK; // just opened windows have a white border
 	this->owner = INVALID_OWNER;
 	this->focused_widget = NULL;
 	this->nested_focus = NULL;
 	this->window_number = window_number;
 	/* If available, initialize nested widget tree. */
 	if (widget == NULL) {
 		if (this->nested_array == NULL) {
@@ @@ -930,17 +938,11 @@ void Window::InitializeData(WindowClass @@
+	}
 	/* Else, all data members of nested widgets have been set to 0 by the #ZeroedMemoryAllocator base class. */
-	/* Set up window properties,
+	/* Further set up window properties,
 	 * this->left, this->top, this->width, this->height, this->resize.width, and this->resize.height are initialized later. */
 	this->window_class = cls;
 	this->flags4 = WF_WHITE_BORDER_MASK; // just opened windows have a white border
 	this->owner = INVALID_OWNER;
 	AssignWidgetToWindow(this, widget);
 	this->focused_widget = NULL;
 	this->nested_focus = NULL;
 	this->resize.step_width  = (this->nested_root != NULL) ? this->nested_root->resize_x : 1;
 	this->resize.step_height = (this->nested_root != NULL) ? this->nested_root->resize_y : 1;
 	this->window_number = window_number;
 	/* Give focus to the opened window unless it is the OSK window or a text box
 	 * of focused window has focus (so we don't interrupt typing). But if the new

0 comments (0 inline, 0 general)