mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16882) -Codechange: Introduce a line_height variable in the station picker window.

release/1.0
alberth 2009-07-19 17:28:20 +00:00
parent 21921441d0
commit a9474bf032
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rail_gui.cpp
View File

@ -938,6 +938,8 @@ enum BuildRailStationWidgets {
struct BuildRailStationWindow : public PickerWindowBase { struct BuildRailStationWindow : public PickerWindowBase {
private: private:
uint line_height; ///< Height of a single line in the newstation selection matrix (#BRSW_NEWST_LIST widget).
/** /**
* Verify whether the currently selected station size is allowed after selecting a new station class/type. * Verify whether the currently selected station size is allowed after selecting a new station class/type.
* If not, change the station size variables ( _settings_client.gui.station_numtracks and _settings_client.gui.station_platlength ). * If not, change the station size variables ( _settings_client.gui.station_numtracks and _settings_client.gui.station_platlength ).
@ -983,6 +985,8 @@ private:
public: public:
BuildRailStationWindow(const WindowDesc *desc, Window *parent, bool newstation) : PickerWindowBase(desc, parent) BuildRailStationWindow(const WindowDesc *desc, Window *parent, bool newstation) : PickerWindowBase(desc, parent)
{ {
this->line_height = FONT_HEIGHT_NORMAL + 4;
this->LowerWidget(_railstation.orientation + BRSW_PLATFORM_DIR_X); this->LowerWidget(_railstation.orientation + BRSW_PLATFORM_DIR_X);
if (_settings_client.gui.station_dragdrop) { if (_settings_client.gui.station_dragdrop) {
this->LowerWidget(BRSW_PLATFORM_DRAG_N_DROP); this->LowerWidget(BRSW_PLATFORM_DRAG_N_DROP);
@ -1095,7 +1099,7 @@ public:
if (statspec != NULL && statspec->name != 0) { if (statspec != NULL && statspec->name != 0) {
if (HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) { if (HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) {
GfxFillRect(left + 1, y - 2, right - 1, y + 10, 0, FILLRECT_CHECKER); GfxFillRect(left + 1, y - 2, right - 1, y + FONT_HEIGHT_NORMAL, 0, FILLRECT_CHECKER);
} }
DrawString(left + 2, right - 2, y, statspec->name, i == _railstation.station_type ? TC_WHITE : TC_BLACK); DrawString(left + 2, right - 2, y, statspec->name, i == _railstation.station_type ? TC_WHITE : TC_BLACK);
@ -1103,7 +1107,7 @@ public:
DrawString(left + 2, right - 2, y, STR_STAT_CLASS_DFLT, i == _railstation.station_type ? TC_WHITE : TC_BLACK); DrawString(left + 2, right - 2, y, STR_STAT_CLASS_DFLT, i == _railstation.station_type ? TC_WHITE : TC_BLACK);
} }
y += 14; y += this->line_height;
} }
} }
} }
@ -1240,7 +1244,7 @@ public:
case BRSW_NEWST_LIST: { case BRSW_NEWST_LIST: {
const StationSpec *statspec; const StationSpec *statspec;
int y = (pt.y - this->widget[BRSW_NEWST_LIST].top) / 14; int y = (pt.y - this->widget[BRSW_NEWST_LIST].top) / this->line_height;
if (y >= this->vscroll.cap) return; if (y >= this->vscroll.cap) return;
y += this->vscroll.pos; y += this->vscroll.pos;