From 313ee13e5fb5dc29f58136c10a61165515acdb7c Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 19 Dec 2023 23:21:12 +0000 Subject: [PATCH] Codechange: Add Rect version of FillDrawPixelInfo(). This simplifies most callers as they longer have to split out a rect. --- src/dock_gui.cpp | 2 +- src/gfx_func.h | 5 +++++ src/industry_gui.cpp | 4 ++-- src/misc_gui.cpp | 2 +- src/newgrf_debug_gui.cpp | 2 +- src/object_gui.cpp | 4 ++-- src/rail_gui.cpp | 10 +++++----- src/road_gui.cpp | 6 +++--- src/roadveh_gui.cpp | 2 +- src/smallmap_gui.cpp | 2 +- src/story_gui.cpp | 2 +- src/textfile_gui.cpp | 2 +- src/train_gui.cpp | 2 +- 13 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index c74eed9e94..ba2d3c3cd5 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -549,7 +549,7 @@ public: case WID_BDD_Y: { Axis axis = widget == WID_BDD_X ? AXIS_X : AXIS_Y; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(96)) / 2; int y = (r.Height() - ScaleSpriteTrad(64)) / 2; diff --git a/src/gfx_func.h b/src/gfx_func.h index e889109674..9210c4fedf 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -153,6 +153,11 @@ void CheckBlitter(); bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int height); +static inline bool FillDrawPixelInfo(DrawPixelInfo *n, const Rect &r) +{ + return FillDrawPixelInfo(n, r.left, r.top, r.Width(), r.Height()); +} + /** * Determine where to draw a centred object inside a widget. * @param min The top or left coordinate. diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 6ed6f03ea7..73f4aeee6b 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1675,7 +1675,7 @@ public: /* Setup a clipping rectangle... */ DrawPixelInfo tmp_dpi; - if (!FillDrawPixelInfo(&tmp_dpi, ir.left, ir.top, ir.Width(), ir.Height())) return; + if (!FillDrawPixelInfo(&tmp_dpi, ir)) return; /* ...but keep coordinates relative to the window. */ tmp_dpi.left += ir.left; tmp_dpi.top += ir.top; @@ -2982,7 +2982,7 @@ struct IndustryCargoesWindow : public Window { Rect ir = r.Shrink(WidgetDimensions::scaled.bevel); DrawPixelInfo tmp_dpi; - if (!FillDrawPixelInfo(&tmp_dpi, ir.left, ir.top, ir.Width(), ir.Height())) return; + if (!FillDrawPixelInfo(&tmp_dpi, ir)) return; AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int left_pos = WidgetDimensions::scaled.frametext.left - WidgetDimensions::scaled.bevel.left; diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index f5dbba0505..d2367c67b0 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -799,7 +799,7 @@ void QueryString::DrawEditBox(const Window *w, int wid) const fr = fr.Shrink(WidgetDimensions::scaled.framerect); /* Limit the drawing of the string inside the widget boundaries */ DrawPixelInfo dpi; - if (!FillDrawPixelInfo(&dpi, fr.left, fr.top, fr.Width(), fr.Height())) return; + if (!FillDrawPixelInfo(&dpi, fr)) return; AutoRestoreBackup dpi_backup(_cur_dpi, &dpi); diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp index 732c9d2aef..51df78f6c9 100644 --- a/src/newgrf_debug_gui.cpp +++ b/src/newgrf_debug_gui.cpp @@ -912,7 +912,7 @@ struct SpriteAlignerWindow : Window { } DrawPixelInfo new_dpi; - if (!FillDrawPixelInfo(&new_dpi, ir.left, ir.top, ir.Width(), ir.Height())) break; + if (!FillDrawPixelInfo(&new_dpi, ir)) break; AutoRestoreBackup dpi_backup(_cur_dpi, &new_dpi); DrawSprite(this->current_sprite, PAL_NONE, x, y, nullptr, SpriteAlignerWindow::zoom); diff --git a/src/object_gui.cpp b/src/object_gui.cpp index 8740a4f25c..facf30e18f 100644 --- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -337,7 +337,7 @@ public: DrawPixelInfo tmp_dpi; /* Set up a clipping area for the preview. */ - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); if (spec->grf_prop.grffile == nullptr) { extern const DrawTileSprites _objects[]; @@ -362,7 +362,7 @@ public: } DrawPixelInfo tmp_dpi; /* Set up a clipping area for the preview. */ - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); if (spec->grf_prop.grffile == nullptr) { extern const DrawTileSprites _objects[]; diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 5eab87035e..328e3f0625 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1243,7 +1243,7 @@ public: switch (GB(widget, 0, 16)) { case WID_BRAS_PLATFORM_DIR_X: /* Set up a clipping area for the '/' station preview */ - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(58)) / 2 - ScaleSpriteTrad(31); @@ -1255,7 +1255,7 @@ public: case WID_BRAS_PLATFORM_DIR_Y: /* Set up a clipping area for the '\' station preview */ - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(58)) / 2 - ScaleSpriteTrad(31); @@ -1290,7 +1290,7 @@ public: } /* Set up a clipping area for the station preview. */ - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(58)) / 2 - ScaleSpriteTrad(31); @@ -1905,7 +1905,7 @@ struct BuildRailDepotWindow : public PickerWindowBase { if (!IsInsideMM(widget, WID_BRAD_DEPOT_NE, WID_BRAD_DEPOT_NW + 1)) return; DrawPixelInfo tmp_dpi; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(48)) / 2 - ScaleSpriteTrad(31); @@ -2095,7 +2095,7 @@ struct BuildRailWaypointWindow : PickerWindowBase { const StationSpec *statspec = this->waypoints->GetSpec(type); DrawPixelInfo tmp_dpi; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(58)) / 2 - ScaleSpriteTrad(31); diff --git a/src/road_gui.cpp b/src/road_gui.cpp index fecb5387aa..4e53907026 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -1029,7 +1029,7 @@ struct BuildRoadDepotWindow : public PickerWindowBase { if (!IsInsideMM(widget, WID_BROD_DEPOT_NE, WID_BROD_DEPOT_NW + 1)) return; DrawPixelInfo tmp_dpi; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(48)) / 2 - ScaleSpriteTrad(31); @@ -1417,7 +1417,7 @@ public: const RoadStopSpec *spec = RoadStopClass::Get(_roadstop_gui_settings.roadstop_class)->GetSpec(_roadstop_gui_settings.roadstop_type); bool disabled = (spec != nullptr && widget < WID_BROS_STATION_X && HasBit(spec->flags, RSF_DRIVE_THROUGH_ONLY)); DrawPixelInfo tmp_dpi; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(48)) / 2 - ScaleSpriteTrad(31); @@ -1459,7 +1459,7 @@ public: /* Set up a clipping area for the sprite preview. */ DrawPixelInfo tmp_dpi; - if (FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) { + if (FillDrawPixelInfo(&tmp_dpi, r)) { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); int x = (r.Width() - ScaleSpriteTrad(64)) / 2 + ScaleSpriteTrad(31); int y = (r.Height() + ScaleSpriteTrad(48)) / 2 - ScaleSpriteTrad(31); diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp index 576e679c4e..f2ee0c6684 100644 --- a/src/roadveh_gui.cpp +++ b/src/roadveh_gui.cpp @@ -128,7 +128,7 @@ void DrawRoadVehImage(const Vehicle *v, const Rect &r, VehicleID selection, Engi DrawPixelInfo tmp_dpi; int max_width = r.Width(); - if (!FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) return; + if (!FillDrawPixelInfo(&tmp_dpi, r)) return; AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 1614c04e1c..3d0c76ca7b 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1543,7 +1543,7 @@ public: case WID_SM_MAP: { Rect ir = r.Shrink(WidgetDimensions::scaled.bevel); DrawPixelInfo new_dpi; - if (!FillDrawPixelInfo(&new_dpi, ir.left, ir.top, ir.Width(), ir.Height())) return; + if (!FillDrawPixelInfo(&new_dpi, ir)) return; this->DrawSmallMap(&new_dpi); break; } diff --git a/src/story_gui.cpp b/src/story_gui.cpp index 15cd7ac994..81c8517f36 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -688,7 +688,7 @@ public: /* Set up a clipping region for the panel. */ DrawPixelInfo tmp_dpi; - if (!FillDrawPixelInfo(&tmp_dpi, fr.left, fr.top, fr.Width(), fr.Height())) return; + if (!FillDrawPixelInfo(&tmp_dpi, fr)) return; AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi); diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp index abfcb25632..578ac7924a 100644 --- a/src/textfile_gui.cpp +++ b/src/textfile_gui.cpp @@ -555,7 +555,7 @@ void TextfileWindow::AfterLoadMarkdown() Rect fr = r.Shrink(WidgetDimensions::scaled.frametext); DrawPixelInfo new_dpi; - if (!FillDrawPixelInfo(&new_dpi, fr.left, fr.top, fr.Width(), fr.Height())) return; + if (!FillDrawPixelInfo(&new_dpi, fr)) return; AutoRestoreBackup dpi_backup(_cur_dpi, &new_dpi); /* Draw content (now coordinates given to DrawString* are local to the new clipping region). */ diff --git a/src/train_gui.cpp b/src/train_gui.cpp index ed7bf46b19..7048c0b818 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -101,7 +101,7 @@ void DrawTrainImage(const Train *v, const Rect &r, VehicleID selection, EngineIm int highlight_r = 0; int max_width = r.Width(); - if (!FillDrawPixelInfo(&tmp_dpi, r.left, r.top, r.Width(), r.Height())) return; + if (!FillDrawPixelInfo(&tmp_dpi, r)) return; { AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi);