diff options
| author | alberth <alberth@openttd.org> | 2009-12-22 19:40:23 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2009-12-22 19:40:23 +0000 |
| commit | 7dbc77a1e74be00f520e84fa1605a9ba42a05879 (patch) | |
| tree | b114f8aaaa25f3b844ec8321b963fd05731e8a8f | |
| parent | 3d2c126268a6fd23c0009348cd31853b182cf917 (diff) | |
| download | openttd-7dbc77a1e74be00f520e84fa1605a9ba42a05879.tar.xz | |
(svn r18605) -Codechange: Coding style fixes, prevent useless calls to UpdateWidgetSize().
| -rw-r--r-- | src/company_gui.cpp | 4 | ||||
| -rw-r--r-- | src/order_gui.cpp | 10 | ||||
| -rw-r--r-- | src/widget.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 8a8016d51..2eaeef22a 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -392,7 +392,7 @@ struct CompanyFinancesWindow : Window { */ 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_MAXLOAN)->SetDisplayedPlane(plane); @@ -404,7 +404,7 @@ struct CompanyFinancesWindow : Window { virtual void OnPaint() { if (!this->IsShaded()) { - if (!small) { + if (!this->small) { /* Check that the expenses panel height matches the height needed for the layout. */ int type = _settings_client.gui.expenses_layout; if (_expenses_list_types[type].GetHeight() != this->GetWidget<NWidgetBase>(CFW_EXPS_CATEGORY)->current_y) { diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 13abe86f1..f148433c1 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1057,7 +1057,7 @@ public: break; case ORDER_WIDGET_NON_STOP: - if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { + if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { this->OrderClick_Nonstop(-1); } else { const Order *o = this->vehicle->GetOrder(this->OrderGetSel()); @@ -1067,7 +1067,7 @@ public: break; case ORDER_WIDGET_GOTO: - if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { + if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { this->OrderClick_Goto(0); } else { 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; case ORDER_WIDGET_FULL_LOAD: - if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { + if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { this->OrderClick_FullLoad(-1); } else { ShowDropDownMenu(this, _order_full_load_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetLoadType(), ORDER_WIDGET_FULL_LOAD, 0, 2); @@ -1083,7 +1083,7 @@ public: break; case ORDER_WIDGET_UNLOAD: - if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { + if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { this->OrderClick_Unload(-1); } else { ShowDropDownMenu(this, _order_unload_drowdown, this->vehicle->GetOrder(this->OrderGetSel())->GetUnloadType(), ORDER_WIDGET_UNLOAD, 0, 8); @@ -1095,7 +1095,7 @@ public: break; case ORDER_WIDGET_SERVICE: - if (GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { + if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) { this->OrderClick_Service(-1); } else { ShowDropDownMenu(this, _order_depot_action_dropdown, DepotActionStringIndex(this->vehicle->GetOrder(this->OrderGetSel())), ORDER_WIDGET_SERVICE, 0, 0); diff --git a/src/widget.cpp b/src/widget.cpp index e403b20c8..a79d01197 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -971,7 +971,7 @@ void NWidgetStacked::SetupSmallestSize(Window *w, bool init_array) Dimension fill = {0, 0}; Dimension resize = {0, 0}; /* 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_y = size.height; |