miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #12465: Click/tooltip alignment of industry chain cargo lines (#14963)

Browse Source
This commit is contained in:
Jonathan G Rennison
2025-12-26 10:20:15 +00:00
committed by dP
parent fc8dd8d524
commit 4756707d0e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/industry_gui.cpp
View File

@@ -2393,17 +2393,17 @@ struct CargoesField {
uint col; uint col;
for (col = 0; col < this->u.cargo.num_cargoes; col++) { for (col = 0; col < this->u.cargo.num_cargoes; col++) {
if (pt.x < cpos) break; if (pt.x < cpos) break;
if (pt.x < cpos + (int)CargoesField::cargo_line.width) return this->u.cargo.vertical_cargoes[col]; if (pt.x < cpos + static_cast<int>(CargoesField::cargo_line.width)) return this->u.cargo.vertical_cargoes[col];
cpos += CargoesField::cargo_line.width + CargoesField::cargo_space.width; cpos += CargoesField::cargo_line.width + CargoesField::cargo_space.width;
} }
/* col = 0 -> left of first col, 1 -> left of 2nd col, ... this->u.cargo.num_cargoes right of last-col. */ /* col = 0 -> left of first col, 1 -> left of 2nd col, ... this->u.cargo.num_cargoes right of last-col. */
int vpos = vert_inter_industry_space / 2 + CargoesField::cargo_border.width; int vpos = (vert_inter_industry_space / 2) + CargoesField::cargo_border.height + (GetCharacterHeight(FS_NORMAL) - CargoesField::cargo_line.height) / 2;
uint row; uint row;
for (row = 0; row < MAX_CARGOES; row++) { for (row = 0; row < MAX_CARGOES; row++) {
if (pt.y < vpos) return INVALID_CARGO; if (pt.y < vpos) return INVALID_CARGO;
if (pt.y < vpos + GetCharacterHeight(FS_NORMAL)) break; if (pt.y < vpos + static_cast<int>(CargoesField::cargo_line.height)) break;
vpos += GetCharacterHeight(FS_NORMAL) + CargoesField::cargo_space.width; vpos += GetCharacterHeight(FS_NORMAL) + CargoesField::cargo_space.height;
} }
if (row == MAX_CARGOES) return INVALID_CARGO; if (row == MAX_CARGOES) return INVALID_CARGO;