(svn r13225) -Fix (r13041): Missing calls to FindWindowPlacementAndResize() from lots
authorpeter1138
Fri, 23 May 2008 23:02:13 +0000
changeset 10681 3aa3de4d448b
parent 10680 66a611e5bc07
child 10682 3b753d908205
(svn r13225) -Fix (r13041): Missing calls to FindWindowPlacementAndResize() from lots
of windows causing 'two stage' opening effect.
src/cheat_gui.cpp
src/engine_gui.cpp
src/genworld_gui.cpp
src/graph_gui.cpp
src/news_gui.cpp
src/player_gui.cpp
src/station_gui.cpp
src/subsidy_gui.cpp
src/timetable_gui.cpp
src/toolbar_gui.cpp
src/town_gui.cpp
src/vehicle_gui.cpp
--- a/src/cheat_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/cheat_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -125,6 +125,7 @@
 
 	CheatWindow(const WindowDesc *desc) : Window(desc)
 	{
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/engine_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/engine_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -69,6 +69,7 @@
 struct EnginePreviewWindow : Window {
 	EnginePreviewWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/genworld_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/genworld_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -645,6 +645,7 @@
 	CreateScenarioWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
 		this->LowerWidget(_opt_newgame.landscape + CSCEN_TEMPERATE);
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
@@ -850,7 +851,10 @@
 	};
 
 public:
-	GenerateProgressWindow() : Window(&_generate_progress_desc) {};
+	GenerateProgressWindow() : Window(&_generate_progress_desc)
+	{
+		this->FindWindowPlacementAndResize(&_generate_progress_desc);
+	}
 
 	virtual void OnClick(Point pt, int widget)
 	{
--- a/src/graph_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/graph_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -769,6 +769,7 @@
 struct CompanyLeagueWindow : Window {
 	CompanyLeagueWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/news_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/news_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -795,6 +795,8 @@
 		}
 		/* If all values are the same value, the ALL-button will take over this value */
 		this->state = all_val;
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	/**
--- a/src/player_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/player_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -165,6 +165,8 @@
 			this->top = top;
 			this->left = left;
 		}
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
@@ -758,7 +760,6 @@
 	SelectPlayerFaceWindow(const WindowDesc *desc, Window *parent, bool advanced, int top, int left) : Window(desc, parent->window_number)
 	{
 		this->parent = parent;
-		this->FindWindowPlacementAndResize(desc);
 		this->caption_color = this->window_number;
 		this->face = GetPlayer((PlayerID)this->window_number)->face;
 		this->advanced = advanced;
@@ -770,6 +771,8 @@
 			this->top = top;
 			this->left = left;
 		}
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
@@ -1167,6 +1170,7 @@
 	PlayerCompanyWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
 		this->caption_color = this->window_number;
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
@@ -1357,6 +1361,7 @@
 struct BuyCompanyWindow : Window {
 	BuyCompanyWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/station_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/station_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -318,6 +318,8 @@
 
 		/* set up resort timer */
 		this->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/subsidy_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/subsidy_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -22,6 +22,7 @@
 struct SubsidyListWindow : Window {
 	SubsidyListWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnClick(Point pt, int widget)
--- a/src/timetable_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/timetable_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -56,6 +56,8 @@
 		this->vscroll.cap = 8;
 		this->resize.step_height = 10;
 		this->sel_index = -1;
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	int GetOrderFromTimetableWndPt(int y, const Vehicle *v)
--- a/src/toolbar_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/toolbar_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -1322,6 +1322,8 @@
 				this->sel_index = 0;
 			}
 		}
+
+		this->FindWindowPlacementAndResize(width, height);
 	}
 
 	~ToolbarPlayerMenuWindow()
--- a/src/town_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/town_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -640,6 +640,7 @@
 	ScenarioEditorTownGenerationWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 	{
 		this->LowerWidget(_scengen_town_size + TSEW_SMALLTOWN);
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	virtual void OnPaint()
--- a/src/vehicle_gui.cpp	Fri May 23 22:55:32 2008 +0000
+++ b/src/vehicle_gui.cpp	Fri May 23 23:02:13 2008 +0000
@@ -1401,6 +1401,8 @@
 		this->caption_color = v->owner;
 
 		this->tab = 0;
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	/** Checks whether service interval is enabled for the vehicle. */
@@ -1873,6 +1875,8 @@
 
 				default: NOT_REACHED();
 		}
+
+		this->FindWindowPlacementAndResize(desc);
 	}
 
 	~VehicleViewWindow()