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

(svn r15877) -Codechange: Let drop down lists know about font height.

release/1.0
peter1138 2009-03-28 12:47:29 +00:00
parent 1d9c362dda
commit f30f5607e3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/company_gui.cpp
View File

@ -480,7 +480,7 @@ public:
uint Height(uint width) const uint Height(uint width) const
{ {
return 14; return max(FONT_HEIGHT_NORMAL, (byte)14);
} }
bool Selectable() const bool Selectable() const
@ -491,7 +491,7 @@ public:
void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
{ {
DrawSprite(SPR_VEH_BUS_SIDE_VIEW, PALETTE_RECOLOUR_START + this->result, left + 16, top + 7); DrawSprite(SPR_VEH_BUS_SIDE_VIEW, PALETTE_RECOLOUR_START + this->result, left + 16, top + 7);
DrawString(left + 32, right - 2, top + 3, this->String(), sel ? TC_WHITE : TC_BLACK); DrawString(left + 32, right - 2, top + max(0, 13 - FONT_HEIGHT_NORMAL), this->String(), sel ? TC_WHITE : TC_BLACK);
} }
}; };

5
src/widgets/dropdown.cpp
View File

@ -17,8 +17,9 @@ void DropDownListItem::Draw(int left, int right, int top, int bottom, bool sel,
int c1 = _colour_gradient[bg_colour][3]; int c1 = _colour_gradient[bg_colour][3];
int c2 = _colour_gradient[bg_colour][7]; int c2 = _colour_gradient[bg_colour][7];
GfxFillRect(left + 1, top + 3, right - 1, top + 3, c1); int mid = top + this->Height(0) / 2;
GfxFillRect(left + 1, top + 4, right - 1, top + 4, c2); GfxFillRect(left + 1, mid - 2, right - 1, mid - 2, c1);
GfxFillRect(left + 1, mid - 1, right - 1, mid - 1, c2);
} }
uint DropDownListStringItem::Width() const uint DropDownListStringItem::Width() const

2
src/widgets/dropdown_type.h
View File

@ -21,7 +21,7 @@ public:
virtual ~DropDownListItem() {} virtual ~DropDownListItem() {}
virtual bool Selectable() const { return false; } virtual bool Selectable() const { return false; }
virtual uint Height(uint width) const { return 10; } virtual uint Height(uint width) const { return FONT_HEIGHT_NORMAL; }
virtual uint Width() const { return 0; } virtual uint Width() const { return 0; }
virtual void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const; virtual void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const;
}; };