petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Scrollbar methods now accept size_t.

Browse Source 
This clears up a lot of casts from size_t to int.
This commit is contained in:
Peter Nelson
2023-05-07 16:10:56 +01:00
committed by PeterN
parent 923d1b0846
commit d2034d9c38
23 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/widget_type.h
View File

@@ -704,10 +704,11 @@ public:
* Set the distance to scroll when using the buttons or the wheel.
* @param stepsize Scrolling speed.
*/
void SetStepSize(uint16 stepsize)
void SetStepSize(size_t stepsize)
{
assert(stepsize > 0);
this->stepsize = stepsize;
this->stepsize = ClampTo<uint16_t>(stepsize);
}
/**
@@ -715,12 +716,11 @@ public:
* @param num the number of elements in the list
* @note updates the position if needed
*/
void SetCount(int num)
void SetCount(size_t num)
{
assert(num >= 0);
assert(num <= MAX_UVALUE(uint16));
this->count = num;
this->count = ClampTo<uint16_t>(num);
num -= this->cap;
if (num < 0) num = 0;
if (num < this->pos) this->pos = num;
@@ -731,12 +731,11 @@ public:
* @param capacity the new capacity
* @note updates the position if needed
*/
void SetCapacity(int capacity)
void SetCapacity(size_t capacity)
{
assert(capacity > 0);
assert(capacity <= MAX_UVALUE(uint16));
this->cap = capacity;
this->cap = ClampTo<uint16_t>(capacity);
if (this->cap + this->pos > this->count) this->pos = std::max(0, this->count - this->cap);
}