diff options
author | Charles Pigott <charlespigott@googlemail.com> | 2021-01-08 10:16:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 11:16:18 +0100 |
commit | 9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch) | |
tree | 3f287d339e15c4902ee415556475fd9b2918d33c /src/textfile_gui.cpp | |
parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/textfile_gui.cpp')
-rw-r--r-- | src/textfile_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp index 7b728e9b2..b83e38187 100644 --- a/src/textfile_gui.cpp +++ b/src/textfile_gui.cpp @@ -98,7 +98,7 @@ uint TextfileWindow::GetContentHeight() resize->height = 1; size->height = 4 * resize->height + TOP_SPACING + BOTTOM_SPACING; // At least 4 lines are visible. - size->width = max(200u, size->width); // At least 200 pixels wide. + size->width = std::max(200u, size->width); // At least 200 pixels wide. break; } } @@ -112,7 +112,7 @@ void TextfileWindow::SetupScrollbars() } else { uint max_length = 0; for (uint i = 0; i < this->lines.size(); i++) { - max_length = max(max_length, GetStringBoundingBox(this->lines[i], FS_MONO).width); + max_length = std::max(max_length, GetStringBoundingBox(this->lines[i], FS_MONO).width); } this->vscroll->SetCount((uint)this->lines.size() * FONT_HEIGHT_MONO); this->hscroll->SetCount(max_length + WD_FRAMETEXT_LEFT + WD_FRAMETEXT_RIGHT); |