cpp/openttd-patchpack/source Changeset - r13605:3347ba366f3e

Changeset - r13605:3347ba366f3e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 15 years ago 2009-11-17 13:07:12
peter1138@openttd.org

(svn r18139) -Codechange: Scale company league table for font height.

1 file changed with 18 insertions and 11 deletions:

src/graph_gui.cpp

0 comments (0 inline, 0 general)

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -872,12 +872,20 @@ void ShowCargoPaymentRates() @@
+}
 /************************/
 /* COMPANY LEAGUE TABLE */
 /************************/
 /** Widget numbers for the company league window. */
 enum CompanyLeagueWidgets {
 	CLW_CLOSEBOX,
 	CLW_CAPTION,
 	CLW_STICKYBOX,
 	CLW_BACKGROUND,
 };
 static const StringID _performance_titles[] = {
 	STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER,
 	STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER,
 	STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER,
 	STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER,
 	STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR,
@@ @@ -938,22 +946,29 @@ public: @@
 	virtual void OnPaint()
+	{
 		this->BuildCompanyList();
 		this->companies.Sort(&PerformanceSorter);
 		this->DrawWidgets();
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
 		if (widget != CLW_BACKGROUND) return;
 		uint y = r.top + WD_FRAMERECT_TOP;
 		for (uint i = 0; i != this->companies.Length(); i++) {
 			const Company *c = this->companies[i];
 			SetDParam(0, i + STR_ORDINAL_NUMBER_1ST);
 			SetDParam(1, c->index);
 			SetDParam(2, c->index);
 			SetDParam(3, GetPerformanceTitleFromValue(c->old_economy[1].performance_history));
 			DrawString(2, this->width, 15 + i * 10, i == 0 ? STR_COMPANY_LEAGUE_FIRST : STR_COMPANY_LEAGUE_OTHER);
 			DrawCompanyIcon(c->index, 27, 16 + i * 10);
 			DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, i == 0 ? STR_COMPANY_LEAGUE_FIRST : STR_COMPANY_LEAGUE_OTHER);
 			DrawCompanyIcon(c->index, 27, y + 1);
 			y += FONT_HEIGHT_NORMAL;
+		}
+	}
 	virtual void OnTick()
+	{
 		if (this->companies.NeedResort()) {
@@ @@ -968,27 +983,19 @@ public: @@
 		} else {
 			this->companies.ForceResort();
+		}
+	}
 };
 /** Widget numbers for the company league window. */
 enum CompanyLeagueWidgets {
 	CLW_CLOSEBOX,
 	CLW_CAPTION,
 	CLW_STICKYBOX,
 	CLW_BACKGROUND,
 };
 static const NWidgetPart _nested_company_league_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, CLW_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, CLW_CAPTION), SetDataTip(STR_COMPANY_LEAGUE_TABLE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, CLW_STICKYBOX),
 	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY, CLW_BACKGROUND), SetMinimalSize(400, 153),
+	NWidget(WWT_PANEL, COLOUR_GREY, CLW_BACKGROUND), SetMinimalSize(400, 0), SetMinimalTextLines(15, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM),
 };
 static const WindowDesc _company_league_desc(
 	WDP_AUTO, WDP_AUTO, 400, 167, 400, 167,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,

0 comments (0 inline, 0 general)