mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18605) -Codechange: Coding style fixes, prevent useless calls to UpdateWidgetSize().

This commit is contained in:
alberth 2009-12-22 19:40:23 +00:00
parent 3d2c126268
commit 7dbc77a1e7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/company_gui.cpp
View File

@ -392,7 +392,7 @@ struct CompanyFinancesWindow : Window {
*/ */
void SetupWidgets() void SetupWidgets()
{ {
int plane = small ? STACKED_SELECTION_ZERO_SIZE : 0; int plane = this->small ? STACKED_SELECTION_ZERO_SIZE : 0;
this->GetWidget<NWidgetStacked>(CFW_SEL_PANEL)->SetDisplayedPlane(plane); this->GetWidget<NWidgetStacked>(CFW_SEL_PANEL)->SetDisplayedPlane(plane);
this->GetWidget<NWidgetStacked>(CFW_SEL_MAXLOAN)->SetDisplayedPlane(plane); this->GetWidget<NWidgetStacked>(CFW_SEL_MAXLOAN)->SetDisplayedPlane(plane);
@ -404,7 +404,7 @@ struct CompanyFinancesWindow : Window {
virtual void OnPaint() virtual void OnPaint()
{ {
if (!this->IsShaded()) { if (!this->IsShaded()) {
if (!small) { if (!this->small) {
/* Check that the expenses panel height matches the height needed for the layout. */ /* Check that the expenses panel height matches the height needed for the layout. */
int type = _settings_client.gui.expenses_layout; int type = _settings_client.gui.expenses_layout;
if (_expenses_list_types[type].GetHeight() != this->GetWidget<NWidgetBase>(CFW_EXPS_CATEGORY)->current_y) { if (_expenses_list_types[type].GetHeight() != this->GetWidget<NWidgetBase>(CFW_EXPS_CATEGORY)->current_y) {

10
src/order_gui.cpp
View File

@ -1057,7 +1057,7 @@ public:
break; break;
case ORDER_WIDGET_NON_STOP: case ORDER_WIDGET_NON_STOP:
if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_Nonstop(-1); this->OrderClick_Nonstop(-1);
} else { } else {
const Order *o = this->vehicle->GetOrder(this->OrderGetSel()); const Order *o = this->vehicle->GetOrder(this->OrderGetSel());
@ -1067,7 +1067,7 @@ public:
break; break;
case ORDER_WIDGET_GOTO: case ORDER_WIDGET_GOTO:
if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_Goto(0); this->OrderClick_Goto(0);
} else { } else {
ShowDropDownMenu(this, this->vehicle->type == VEH_AIRCRAFT ? _order_goto_dropdown_aircraft : _order_goto_dropdown, 0, ORDER_WIDGET_GOTO, 0, 0); ShowDropDownMenu(this, this->vehicle->type == VEH_AIRCRAFT ? _order_goto_dropdown_aircraft : _order_goto_dropdown, 0, ORDER_WIDGET_GOTO, 0, 0);
@ -1075,7 +1075,7 @@ public:
break; break;
case ORDER_WIDGET_FULL_LOAD: case ORDER_WIDGET_FULL_LOAD:
if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_FullLoad(-1); this->OrderClick_FullLoad(-1);
} else { } else {
ShowDropDownMenu(this, _order_full_load_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetLoadType(), ORDER_WIDGET_FULL_LOAD, 0, 2); ShowDropDownMenu(this, _order_full_load_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetLoadType(), ORDER_WIDGET_FULL_LOAD, 0, 2);
@ -1083,7 +1083,7 @@ public:
break; break;
case ORDER_WIDGET_UNLOAD: case ORDER_WIDGET_UNLOAD:
if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_Unload(-1); this->OrderClick_Unload(-1);
} else { } else {
ShowDropDownMenu(this, _order_unload_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetUnloadType(), ORDER_WIDGET_UNLOAD, 0, 8); ShowDropDownMenu(this, _order_unload_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetUnloadType(), ORDER_WIDGET_UNLOAD, 0, 8);
@ -1095,7 +1095,7 @@ public:
break; break;
case ORDER_WIDGET_SERVICE: case ORDER_WIDGET_SERVICE:
if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
this->OrderClick_Service(-1); this->OrderClick_Service(-1);
} else { } else {
ShowDropDownMenu(this, _order_depot_action_dropdown, DepotActionStringIndex(this->vehicle->GetOrder(this->OrderGetSel())), ORDER_WIDGET_SERVICE, 0, 0); ShowDropDownMenu(this, _order_depot_action_dropdown, DepotActionStringIndex(this->vehicle->GetOrder(this->OrderGetSel())), ORDER_WIDGET_SERVICE, 0, 0);

2
src/widget.cpp
View File

@ -971,7 +971,7 @@ void NWidgetStacked::SetupSmallestSize(Window *w, bool init_array)
Dimension fill = {0, 0}; Dimension fill = {0, 0};
Dimension resize = {0, 0}; Dimension resize = {0, 0};
/* Here we're primarily interested in the value of resize */ /* Here we're primarily interested in the value of resize */
w->UpdateWidgetSize(this->index, &size, padding, &fill, &resize); if (this->index >= 0) w->UpdateWidgetSize(this->index, &size, padding, &fill, &resize);
this->smallest_x = size.width; this->smallest_x = size.width;
this->smallest_y = size.height; this->smallest_y = size.height;