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

(svn r17796) -Codechange: Move drawing of the industry info to its own function.

release/1.0
alberth 2009-10-18 13:40:11 +00:00
parent 2e766884f6
commit 29028b3f8a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/industry_gui.cpp
View File

@ -495,7 +495,13 @@ public:
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
} }
virtual void OnPaint() /** Draw the text in the #IVW_INFO panel.
* @param left Left edge of the panel.
* @param right Right edge of the panel.
* @param top Top edge of the panel.
* @return Expected position of the bottom edge of the panel.
*/
int DrawInfo(uint left, uint right, uint top)
{ {
Industry *i = Industry::Get(this->window_number); Industry *i = Industry::Get(this->window_number);
const IndustrySpec *ind = GetIndustrySpec(i->type); const IndustrySpec *ind = GetIndustrySpec(i->type);
@ -503,9 +509,6 @@ public:
bool first = true; bool first = true;
bool has_accept = false; bool has_accept = false;
SetDParam(0, this->window_number);
this->DrawWidgets();
if (HasBit(ind->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(ind->callback_mask, CBM_IND_PRODUCTION_256_TICKS)) { if (HasBit(ind->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(ind->callback_mask, CBM_IND_PRODUCTION_256_TICKS)) {
for (byte j = 0; j < lengthof(i->accepts_cargo); j++) { for (byte j = 0; j < lengthof(i->accepts_cargo); j++) {
if (i->accepts_cargo[j] == CT_INVALID) continue; if (i->accepts_cargo[j] == CT_INVALID) continue;
@ -581,6 +584,15 @@ public:
} }
} }
} }
return y;
}
virtual void OnPaint()
{
SetDParam(0, this->window_number);
this->DrawWidgets();
int y = this->DrawInfo(this->widget[IVW_INFO].left, this->widget[IVW_INFO].right, this->widget[IVW_INFO].top);
if (y > this->widget[IVW_INFO].bottom) { if (y > this->widget[IVW_INFO].bottom) {
this->SetDirty(); this->SetDirty();