dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use int32_t instead of uint16_t for scroll bar position/size/capacity

Browse Source 
(cherry picked from commit d09b5aaeba)

# Conflicts:
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/widget_type.h
This commit is contained in:
Rubidium
2024-02-25 19:42:28 +01:00
committed by Jonathan G Rennison
parent 2219b8e378
commit 5d8e40cad4
17 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/departures_gui.cpp
View File

@@ -403,9 +403,9 @@ public:
/* We need to find the departure corresponding to where the user clicked. */
uint32_t id_v = (pt.y - this->GetWidget<NWidgetBase>(WID_DB_LIST)->pos_y) / this->entry_height;
if (id_v >= this->vscroll->GetCapacity()) return; // click out of bounds
if (id_v >= (uint32_t)this->vscroll->GetCapacity()) return; // click out of bounds
id_v += this->vscroll->GetPosition();
id_v += (uint32_t)this->vscroll->GetPosition();
if (id_v >= (this->departures->size() + this->arrivals->size())) return; // click out of list bound
@@ -769,7 +769,7 @@ void DeparturesWindow<Twaypoint>::DrawDeparturesListItems(const Rect &r) const
}
}
if (i < this->vscroll->GetPosition()) {
if (i < (uint32_t)this->vscroll->GetPosition()) {
continue;
}