petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r23547) -Codechange: document and rename widgets to be consistent and understandable

Browse Source
This commit is contained in:
truebrain
2011-12-16 18:21:13 +00:00
parent 9266bde593
commit e2726ca3f1
8 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/statusbar_gui.cpp
View File

@@ -103,12 +103,12 @@ struct StatusBarWindow : Window {
{
Dimension d;
switch (widget) {
case SBW_LEFT:
case WID_S_LEFT:
SetDParam(0, MAX_YEAR * DAYS_IN_YEAR);
d = GetStringBoundingBox(STR_WHITE_DATE_LONG);
break;
case SBW_RIGHT: {
case WID_S_RIGHT: {
int64 max_money = UINT32_MAX;
const Company *c;
FOR_ALL_COMPANIES(c) max_money = max<int64>(c->money, max_money);
@@ -129,13 +129,13 @@ struct StatusBarWindow : Window {
virtual void DrawWidget(const Rect &r, int widget) const
{
switch (widget) {
case SBW_LEFT:
case WID_S_LEFT:
/* Draw the date */
SetDParam(0, _date);
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, STR_WHITE_DATE_LONG, TC_FROMSTRING, SA_HOR_CENTER);
break;
case SBW_RIGHT: {
case WID_S_RIGHT: {
/* Draw company money, if any */
const Company *c = Company::GetIfValid(_local_company);
if (c != NULL) {
@@ -145,7 +145,7 @@ struct StatusBarWindow : Window {
break;
}
case SBW_MIDDLE:
case WID_S_MIDDLE:
/* Draw status bar */
if (this->saving) { // true when saving is active
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, STR_STATUSBAR_SAVING_GAME, TC_FROMSTRING, SA_HOR_CENTER);
@@ -203,8 +203,8 @@ struct StatusBarWindow : Window {
virtual void OnClick(Point pt, int widget, int click_count)
{
switch (widget) {
case SBW_MIDDLE: ShowLastNewsMessage(); break;
case SBW_RIGHT: if (_local_company != COMPANY_SPECTATOR) ShowCompanyFinances(_local_company); break;
case WID_S_MIDDLE: ShowLastNewsMessage(); break;
case WID_S_RIGHT: if (_local_company != COMPANY_SPECTATOR) ShowCompanyFinances(_local_company); break;
default: ResetObjectToPlace();
}
}
@@ -215,23 +215,23 @@ struct StatusBarWindow : Window {
if (this->ticker_scroll < TICKER_STOP) { // Scrolling text
this->ticker_scroll += COUNTER_STEP;
this->SetWidgetDirty(SBW_MIDDLE);
this->SetWidgetDirty(WID_S_MIDDLE);
}
if (this->reminder_timeout > REMINDER_STOP) { // Red blot to show there are new unread newsmessages
this->reminder_timeout -= COUNTER_STEP;
} else if (this->reminder_timeout < REMINDER_STOP) {
this->reminder_timeout = REMINDER_STOP;
this->SetWidgetDirty(SBW_MIDDLE);
this->SetWidgetDirty(WID_S_MIDDLE);
}
}
};
static const NWidgetPart _nested_main_status_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PANEL, COLOUR_GREY, SBW_LEFT), SetMinimalSize(140, 12), EndContainer(),
NWidget(WWT_PUSHBTN, COLOUR_GREY, SBW_MIDDLE), SetMinimalSize(40, 12), SetDataTip(0x0, STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS), SetResize(1, 0),
NWidget(WWT_PUSHBTN, COLOUR_GREY, SBW_RIGHT), SetMinimalSize(140, 12),
NWidget(WWT_PANEL, COLOUR_GREY, WID_S_LEFT), SetMinimalSize(140, 12), EndContainer(),
NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_S_MIDDLE), SetMinimalSize(40, 12), SetDataTip(0x0, STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS), SetResize(1, 0),
NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_S_RIGHT), SetMinimalSize(140, 12),
EndContainer(),
};