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

12
src/newgrf_debug_gui.cpp
View File

@@ -339,7 +339,7 @@ struct NewGRFInspectWindow : Window {
Scrollbar *vscroll;
int first_variable_line_index = 0;
int32_t first_variable_line_index = 0;
bool redraw_panel = false;
bool redraw_scrollbar = false;
@@ -569,7 +569,7 @@ struct NewGRFInspectWindow : Window {
const void *base = nih->GetInstance(index);
const void *base_spec = nih->GetSpec(index);
uint i = 0;
int32_t i = 0;
auto guard = scope_guard([&]() {
if (this->log_console) {
@@ -577,12 +577,12 @@ struct NewGRFInspectWindow : Window {
DEBUG(misc, 0, "*** END ***");
}
uint count = std::min<uint>(UINT16_MAX, i);
const int32_t count = i;
if (vscroll->GetCount() != count) {
/* Not nice and certainly a hack, but it beats duplicating
* this whole function just to count the actual number of
* elements. Especially because they need to be redrawn. */
uint position = this->vscroll->GetPosition();
const int32_t position = this->vscroll->GetPosition();
const_cast<NewGRFInspectWindow*>(this)->vscroll->SetCount(count);
const_cast<NewGRFInspectWindow*>(this)->redraw_scrollbar = true;
if (position != this->vscroll->GetPosition()) {
@@ -921,8 +921,8 @@ struct NewGRFInspectWindow : Window {
case WID_NGRFI_MAINPANEL: {
/* Get the line, make sure it's within the boundaries. */
int line = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_NGRFI_MAINPANEL, WidgetDimensions::scaled.framerect.top);
if (line == INT_MAX) return;
int32_t line = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_NGRFI_MAINPANEL, WidgetDimensions::scaled.framerect.top);
if (line == INT32_MAX) return;
if (this->sprite_dump) {
if (_ctrl_pressed) {