Mercurial > hg > openttd

changeset 20588:f97d0e2b7784 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window.
author frosch <frosch@openttd.org>
date Sun, 30 Jun 2013 14:33:15 +0000
parents 3ebf57ab8def
children 32521c1e0f03
files src/ai/ai_gui.cpp src/airport_gui.cpp src/newgrf_gui.cpp src/object_gui.cpp src/rail_gui.cpp
diffstat 5 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -111,7 +111,7 @@
 
 			resize->width = 1;
 			resize->height = this->line_height;
-			size->height = GB(this->GetWidget<NWidgetCore>(widget)->widget_data, MAT_ROW_START, MAT_ROW_BITS) * this->line_height;
+			size->height = 5 * this->line_height;
 		}
 	}
 
@@ -351,7 +351,7 @@
 
 			resize->width = 1;
 			resize->height = this->line_height;
-			size->height = GB(this->GetWidget<NWidgetCore>(widget)->widget_data, MAT_ROW_START, MAT_ROW_BITS) * this->line_height;
+			size->height = 5 * this->line_height;
 		}
 	}
 
@@ -761,9 +761,13 @@
 	{
 		switch (widget) {
 			case WID_AIC_GAMELIST:
+				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
+				size->height = 1 * this->line_height;
+				break;
+
 			case WID_AIC_LIST:
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
-				size->height = GB(this->GetWidget<NWidgetCore>(widget)->widget_data, MAT_ROW_START, MAT_ROW_BITS) * this->line_height;
+				size->height = 8 * this->line_height;
 				break;
 		}
 	}
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -284,7 +284,7 @@
 				}
 
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
-				size->height = this->vscroll->GetCapacity() * this->line_height;
+				size->height = 5 * this->line_height;
 				break;
 			}
 
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -215,7 +215,7 @@
 
 				resize->width = 1;
 				resize->height = this->line_height;
-				size->height = GB(this->GetWidget<NWidgetCore>(widget)->widget_data, MAT_ROW_START, MAT_ROW_BITS) * this->line_height;
+				size->height = 5 * this->line_height;
 				break;
 
 			case WID_NP_DESCRIPTION:
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -153,7 +153,7 @@
 				size->width += padding.width;
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
 				resize->height = this->line_height;
-				size->height = this->vscroll->GetCapacity() * this->line_height;
+				size->height = 5 * this->line_height;
 				break;
 			}
 
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -1037,7 +1037,7 @@
 				}
 				size->width = max(size->width, d.width + padding.width);
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
-				size->height = GB(this->GetWidget<NWidgetCore>(widget)->widget_data, MAT_ROW_START, MAT_ROW_BITS) * this->line_height;
+				size->height = 5 * this->line_height;
 				resize->height = this->line_height;
 				break;
 			}