Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delivered cargo graph: Add missing overrides, remove unused variable

Browse Source
pull/532/head
Jonathan G Rennison 1 year ago
parent ac2f9a21e8
commit f8301f735f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File

10
src/graph_gui.cpp
Unescape Escape View File

@ -746,7 +746,7 @@ struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
this->legend_width = (FONT_HEIGHT_SMALL - ScaleGUITrad(1)) * 8 / 5; this->legend_width = (FONT_HEIGHT_SMALL - ScaleGUITrad(1)) * 8 / 5;
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{ {
if (widget != WID_ECBG_MATRIX) { if (widget != WID_ECBG_MATRIX) {
BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize); BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
@ -768,7 +768,7 @@ struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
resize->height = this->line_height; resize->height = this->line_height;
} }
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const override
{ {
if (widget != WID_ECBG_MATRIX) { if (widget != WID_ECBG_MATRIX) {
BaseGraphWindow::DrawWidget(r, widget); BaseGraphWindow::DrawWidget(r, widget);
@ -805,7 +805,7 @@ struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
} }
} }
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count) override
{ {
switch (widget) { switch (widget) {
case WID_CV_KEY_BUTTON: case WID_CV_KEY_BUTTON:
@ -820,10 +820,8 @@ struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
case WID_ECBG_DISABLE_CARGOES: { case WID_ECBG_DISABLE_CARGOES: {
/* Add all cargoes to the excluded lists. */ /* Add all cargoes to the excluded lists. */
int i = 0;
for (const CargoSpec *cs : _sorted_standard_cargo_specs) { for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
SetBit(_legend_excluded_cargo, cs->Index()); SetBit(_legend_excluded_cargo, cs->Index());
i++;
} }
this->UpdateCargoExcludingGraphs(); this->UpdateCargoExcludingGraphs();
break; break;
@ -845,7 +843,7 @@ struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
} }
} }
virtual void OnResize() virtual void OnResize() override
{ {
this->vscroll->SetCapacityFromWidget(this, WID_ECBG_MATRIX); this->vscroll->SetCapacityFromWidget(this, WID_ECBG_MATRIX);
} }

Write Preview
Loading…
Cancel
Save