cpp/openttd-patchpack/source Changeset - r23441:2965f5a62eaa

Changeset - r23441:2965f5a62eaa

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

peter1138 - 5 years ago 2019-03-09 18:20:03
peter1138@openttd.org

Codechange: Use Colours type instead of byte.

5 files changed with 8 insertions and 8 deletions:

src/company_gui.cpp

src/newgrf_gui.cpp

src/toolbar_gui.cpp

src/widgets/dropdown.cpp

src/widgets/dropdown_type.h

0 comments (0 inline, 0 general)

src/company_gui.cpp

➞

Show inline comments

@@ @@ -536,7 +536,7 @@ public: @@
 		return true;
+	}
-	void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	{
 		bool rtl = _current_text_dir == TD_RTL;
 		int height = bottom - top;

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -578,7 +578,7 @@ public: @@
 		return true;
+	}
-	void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	{
 		DrawString(left + 2, right + 2, top, _grf_preset_list[this->result], sel ? TC_WHITE : TC_BLACK);
+	}

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -104,7 +104,7 @@ public: @@
 		return DropDownListStringItem::Width() + this->checkmark_width;
+	}
-	void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	{
 		bool rtl = _current_text_dir == TD_RTL;
 		if (this->checked) {
@@ @@ -149,7 +149,7 @@ public: @@
 		return max(max(this->icon_size.height, this->lock_size.height) + 2U, (uint)FONT_HEIGHT_NORMAL);
+	}
-	void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	{
 		CompanyID company = (CompanyID)this->result;
 		bool rtl = _current_text_dir == TD_RTL;

src/widgets/dropdown.cpp

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ @@
 #include "../safeguards.h"
-void DropDownListItem::Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+void DropDownListItem::Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+{
 	int c1 = _colour_gradient[bg_colour][3];
 	int c2 = _colour_gradient[bg_colour][7];
@@ @@ -39,7 +39,7 @@ uint DropDownListStringItem::Width() con @@
 	return GetStringBoundingBox(buffer).width;
+}
-void DropDownListStringItem::Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
+void DropDownListStringItem::Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+{
 	DrawString(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top, this->String(), sel ? TC_WHITE : TC_BLACK);
+}

src/widgets/dropdown_type.h

➞

Show inline comments

@@ @@ -32,7 +32,7 @@ public: @@
 	virtual bool Selectable() const { return false; }
 	virtual uint Height(uint width) const { return FONT_HEIGHT_NORMAL; }
 	virtual uint Width() const { return 0; }
-	virtual void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const;
+	virtual void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const;
 };
 /**
@@ @@ -47,7 +47,7 @@ public: @@
 	virtual bool Selectable() const { return true; }
 	virtual uint Width() const;
-	virtual void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const;
+	virtual void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const;
 	virtual StringID String() const { return this->string; }
 	static int CDECL NatSortFunc(const DropDownListItem * const *first, const DropDownListItem * const *second);

0 comments (0 inline, 0 general)