From e2e0753916b0d43a2d4d0a43aa0a08ef128cf2d3 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 16 Nov 2023 17:06:57 +0000 Subject: [PATCH] Codechange: Use GetCurrentRect() where feasible. (#11460) --- src/toolbar_gui.cpp | 5 +++-- src/widget.cpp | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 25032ae136..7dc909b671 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1490,8 +1490,9 @@ public: void Draw(const Window *w) override { /* Draw brown-red toolbar bg. */ - GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, PC_VERY_DARK_RED); - GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, PC_DARK_RED, FILLRECT_CHECKER); + const Rect r = this->GetCurrentRect(); + GfxFillRect(r, PC_VERY_DARK_RED); + GfxFillRect(r, PC_DARK_RED, FILLRECT_CHECKER); this->NWidgetContainer::Draw(w); } diff --git a/src/widget.cpp b/src/widget.cpp index 74bf61b2db..53d26e4ac5 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2093,7 +2093,7 @@ NWidgetCore *NWidgetMatrix::GetWidgetFromPos(int x, int y) /* virtual */ void NWidgetMatrix::Draw(const Window *w) { /* Fill the background. */ - GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, _colour_gradient[this->colour & 0xF][5]); + GfxFillRect(this->GetCurrentRect(), _colour_gradient[this->colour & 0xF][5]); /* Set up a clipping area for the previews. */ bool rtl = _current_text_dir == TD_RTL; @@ -2419,8 +2419,7 @@ void NWidgetViewport::Draw(const Window *w) /* Optionally shade the viewport. */ if (this->disp_flags & (ND_SHADE_GREY | ND_SHADE_DIMMED)) { - GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, - (this->disp_flags & ND_SHADE_DIMMED) ? PALETTE_TO_TRANSPARENT : PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); + GfxFillRect(this->GetCurrentRect(), (this->disp_flags & ND_SHADE_DIMMED) ? PALETTE_TO_TRANSPARENT : PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); } DrawOutline(w, this);