diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-22 19:40:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-22 19:40:48 +0000 |
| commit | f381f9b46f723a020e2e8da7e9f12fef35cb7eab (patch) | |
| tree | 64bea0d361e9023c9dcdf672f5532f5231249d4f | |
| parent | 5c13e0c1e6adb0b5b488c2c370417d0c6deba7d8 (diff) | |
| download | openttd-f381f9b46f723a020e2e8da7e9f12fef35cb7eab.tar.xz | |
(svn r18242) -Codechange: make the refit window big font aware
| -rw-r--r-- | src/vehicle_gui.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 1c3e2ebed..5685f282f 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -358,9 +358,6 @@ struct RefitWindow : public Window { resize->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM; size->height = resize->height * 8; break; - case VRW_INFOPANEL: - size->height = max(size->height, (uint)(WD_FRAMERECT_TOP + 2 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_BOTTOM)); - break; } } @@ -436,15 +433,15 @@ static const NWidgetPart _nested_vehicle_refit_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_GREY, VRW_CLOSEBOX), NWidget(WWT_CAPTION, COLOUR_GREY, VRW_CAPTION), SetDataTip(STR_REFIT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), - NWidget(WWT_TEXTBTN, COLOUR_GREY, VRW_SELECTHEADER), SetMinimalSize(240, 14), SetDataTip(STR_REFIT_TITLE, STR_NULL), + NWidget(WWT_TEXTBTN, COLOUR_GREY, VRW_SELECTHEADER), SetDataTip(STR_REFIT_TITLE, STR_NULL), SetResize(1, 0), /* Matrix + scrollbar. */ NWidget(NWID_HORIZONTAL), - NWidget(WWT_MATRIX, COLOUR_GREY, VRW_MATRIX), SetMinimalSize(228, 112), SetResize(0, 14), SetDataTip(0x801, STR_NULL), + NWidget(WWT_MATRIX, COLOUR_GREY, VRW_MATRIX), SetMinimalSize(228, 112), SetResize(1, 14), SetFill(1, 1), SetDataTip(0x801, STR_NULL), NWidget(WWT_SCROLLBAR, COLOUR_GREY, VRW_SCROLLBAR), EndContainer(), - NWidget(WWT_PANEL, COLOUR_GREY, VRW_INFOPANEL), SetMinimalSize(240, 22), EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY, VRW_INFOPANEL), SetMinimalTextLines(2, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM), SetResize(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VRW_REFITBUTTON), SetMinimalSize(228, 12), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VRW_REFITBUTTON), SetFill(1, 0), SetResize(1, 0), NWidget(WWT_RESIZEBOX, COLOUR_GREY, VRW_RESIZEBOX), EndContainer(), }; |