petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(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.

Browse Source
This commit is contained in:
frosch
2013-06-30 14:33:15 +00:00
parent 98fdd20f84
commit 5f8f71edf0
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ai/ai_gui.cpp
View File

@@ -111,7 +111,7 @@ struct AIListWindow : public Window {
resize->width = 1; resize->width = 1;
resize->height = this->line_height; 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 @@ struct AISettingsWindow : public Window {
resize->width = 1; resize->width = 1;
resize->height = this->line_height; 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 @@ struct AIConfigWindow : public Window {
{ {
switch (widget) { switch (widget) {
case WID_AIC_GAMELIST: 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: case WID_AIC_LIST:
this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; 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; break;
} }
} }

2
src/airport_gui.cpp
View File

@@ -284,7 +284,7 @@ public:
} }
this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; 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; break;
} }

2
src/newgrf_gui.cpp
View File

@@ -215,7 +215,7 @@ struct NewGRFParametersWindow : public Window {
resize->width = 1; resize->width = 1;
resize->height = this->line_height; 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; break;
case WID_NP_DESCRIPTION: case WID_NP_DESCRIPTION:

2
src/object_gui.cpp
View File

@@ -153,7 +153,7 @@ public:
size->width += padding.width; size->width += padding.width;
this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
resize->height = this->line_height; resize->height = this->line_height;
size->height = this->vscroll->GetCapacity() * this->line_height; size->height = 5 * this->line_height;
break; break;
} }

2
src/rail_gui.cpp
View File

@@ -1037,7 +1037,7 @@ public:
} }
size->width = max(size->width, d.width + padding.width); size->width = max(size->width, d.width + padding.width);
this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; 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; resize->height = this->line_height;
break; break;
} }