cpp/openttd-patchpack/source Changeset - r28144:a1462ccbe7d4

Changeset - r28144:a1462ccbe7d4

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Peter Nelson - 13 months ago 2023-11-16 17:06:57
peter1138@openttd.org

Codechange: Use GetCurrentRect() where feasible. (#11460)

2 files changed with 5 insertions and 5 deletions:

src/toolbar_gui.cpp

src/widget.cpp

0 comments (0 inline, 0 general)

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -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);
+	}

src/widget.cpp

➞

Show inline comments

@@ @@ -2093,7 +2093,7 @@ NWidgetCore *NWidgetMatrix::GetWidgetFro @@
 /* 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 @@
 	/* 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);

0 comments (0 inline, 0 general)