changeset 13341:efb5e73d2827 draft

(svn r17850) -Codechange: remove most usage of delta on OnResize
author rubidium <rubidium@openttd.org>
date Sat, 24 Oct 2009 09:47:02 +0000
parents d482f09e16bd
children 6d41cd84ffd9
files src/build_vehicle_gui.cpp src/smallmap_gui.cpp src/station_gui.cpp src/vehicle_gui.cpp
diffstat 4 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1172,10 +1172,7 @@
 
 	virtual void OnResize(Point delta)
 	{
-		if (delta.x != 0 && !this->listview_mode) {
-			ResizeButtons(this, BUILD_VEHICLE_WIDGET_BUILD, BUILD_VEHICLE_WIDGET_RENAME);
-		}
-		if (delta.y == 0) return;
+		if (!this->listview_mode) ResizeButtons(this, BUILD_VEHICLE_WIDGET_BUILD, BUILD_VEHICLE_WIDGET_RENAME);
 
 		this->vscroll.SetCapacity((this->widget[BUILD_VEHICLE_WIDGET_LIST].bottom - this->widget[BUILD_VEHICLE_WIDGET_LIST].top + 1) / GetVehicleListHeight(this->vehicle_type));
 		this->widget[BUILD_VEHICLE_WIDGET_LIST].data = (this->vscroll.GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START);
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -1135,7 +1135,7 @@
 
 	virtual void OnResize(Point delta)
 	{
-		if (delta.x != 0 && this->map_type == SMT_INDUSTRY) this->ResizeLegend();
+		if (this->map_type == SMT_INDUSTRY) this->ResizeLegend();
 	}
 
 	void SmallMapCenterOnCurrentPos()
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -1051,7 +1051,7 @@
 
 	virtual void OnResize(Point delta)
 	{
-		if (delta.x != 0) ResizeButtons(this, SVW_LOCATION, SVW_RENAME);
+		ResizeButtons(this, SVW_LOCATION, SVW_RENAME);
 		this->vscroll.SetCapacity((this->widget[SVW_WAITING].bottom - this->widget[SVW_WAITING].top + 1) / this->resize.step_height);
 	}
 };
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1498,8 +1498,7 @@
 
 	virtual void OnResize(Point delta)
 	{
-		if (delta.x != 0) ResizeButtons(this, VLD_WIDGET_DETAILS_CARGO_CARRIED, VLD_WIDGET_DETAILS_TOTAL_CARGO);
-		if (delta.y == 0) return;
+		ResizeButtons(this, VLD_WIDGET_DETAILS_CARGO_CARRIED, VLD_WIDGET_DETAILS_TOTAL_CARGO);
 
 		this->vscroll.SetCapacity((this->widget[VLD_WIDGET_MIDDLE_DETAILS].bottom - this->widget[VLD_WIDGET_MIDDLE_DETAILS].top + 1) / 14);
 		this->widget[VLD_WIDGET_MIDDLE_DETAILS].data = (this->vscroll.GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START);