diff options
| author | bjarni <bjarni@openttd.org> | 2006-10-10 10:04:09 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-10-10 10:04:09 +0000 |
| commit | 7311b305e8901cce3a1f646f0bc41f4de79725bf (patch) | |
| tree | c6fead245b0e7cc77cf80f57e753e6db2e614885 | |
| parent | 9c611b08483897b982eb684102abafa86e7fd65c (diff) | |
| download | openttd-7311b305e8901cce3a1f646f0bc41f4de79725bf.tar.xz | |
(svn r6718) -Codechange: added function to get the line height for a vehicle type
-Fix r6513: [depot window] fixed incorrect line height for large ships
-Fix r6513: [depot window] fixed incorrect resizing of the sell button
| -rw-r--r-- | depot_gui.c | 14 | ||||
| -rw-r--r-- | vehicle_gui.h | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/depot_gui.c b/depot_gui.c index dbdf29f9f..a9900d716 100644 --- a/depot_gui.c +++ b/depot_gui.c @@ -53,7 +53,7 @@ static const byte widget_moves[] = { WIDGET_MOVE_NONE, // DEPOT_WIDGET_CLOSEBOX WIDGET_STRETCH_RIGHT, // DEPOT_WIDGET_CAPTION WIDGET_MOVE_RIGHT, // DEPOT_WIDGET_STICKY - WIDGET_MOVE_RIGHT, // DEPOT_WIDGET_SELL + WIDGET_MOVE_RIGHT_STRETCH_DOWN, // DEPOT_WIDGET_SELL WIDGET_MOVE_NONE, // DEPOT_WIDGET_SELL_CHAIN WIDGET_MOVE_DOWN_RIGHT, // DEPOT_WIDGET_SELL_ALL WIDGET_MOVE_DOWN_RIGHT, // DEPOT_WIDGET_AUTOREPLACE @@ -125,7 +125,7 @@ static const WindowDesc _road_depot_desc = { }; static const WindowDesc _ship_depot_desc = { - -1, -1, 305, 96, + -1, -1, 305, 98, WC_VEHICLE_DEPOT,0, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _depot_widgets, @@ -133,7 +133,7 @@ static const WindowDesc _ship_depot_desc = { }; static const WindowDesc _aircraft_depot_desc = { - -1, -1, 331, 96, + -1, -1, 331, 98, WC_VEHICLE_DEPOT,0, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _depot_widgets, @@ -969,7 +969,6 @@ void ShowDepotWindow(TileIndex tile, byte type) w->vscroll.cap = 6; w->hscroll.cap = 10 * 29; w->resize.step_width = 1; - w->resize.step_height = 14; break; case VEH_Road: @@ -978,27 +977,28 @@ void ShowDepotWindow(TileIndex tile, byte type) w->vscroll.cap = 5; w->hscroll.cap = 5; w->resize.step_width = 56; - w->resize.step_height = 14; break; case VEH_Ship: + vertical = 2; w->vscroll.cap = 3; w->hscroll.cap = 3; w->resize.step_width = 90; - w->resize.step_height = 23; break; case VEH_Aircraft: horizontal = 26; + vertical = 2; w->vscroll.cap = 3; w->hscroll.cap = 4; w->resize.step_width = 74; - w->resize.step_height = 23; break; default: NOT_REACHED(); } + w->resize.step_height = GetVehicleListHeight(type); + SetupStringsForDepotWindow(w, type); w->widget[DEPOT_WIDGET_MATRIX].data = diff --git a/vehicle_gui.h b/vehicle_gui.h index e13a95677..0b27bbd24 100644 --- a/vehicle_gui.h +++ b/vehicle_gui.h @@ -68,4 +68,9 @@ static inline void DrawVehicleImage(const Vehicle *v, int x, int y, int count, i } } +static inline byte GetVehicleListHeight(byte type) +{ + return (type == VEH_Train || type == VEH_Road) ? 14 : 24; +} + #endif /* VEHICLE_GUI_H */ |