mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7384: Industry Chain tooltips did not display on right-click. 

This is fixed by handling the new Window::OnTooltip() event instead of OnHover()
pull/7393/head
peter1138 2019-03-20 02:16:05 +00:00 committed by PeterN
parent f5f33da126
commit b3ef06fdf3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/industry_gui.cpp
View File

@ -2753,12 +2753,12 @@ struct IndustryCargoesWindow : public Window {
} }
} }
virtual void OnHover(Point pt, int widget) bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond)
{ {
if (widget != WID_IC_PANEL) return; if (widget != WID_IC_PANEL) return false;
Point fieldxy, xy; Point fieldxy, xy;
if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return; if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return false;
const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x; const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x;
CargoID cid = INVALID_CARGO; CargoID cid = INVALID_CARGO;
@ -2777,9 +2777,9 @@ struct IndustryCargoesWindow : public Window {
case CFT_INDUSTRY: case CFT_INDUSTRY:
if (fld->u.industry.ind_type < NUM_INDUSTRYTYPES && (this->ind_cargo >= NUM_INDUSTRYTYPES || fieldxy.x != 2)) { if (fld->u.industry.ind_type < NUM_INDUSTRYTYPES && (this->ind_cargo >= NUM_INDUSTRYTYPES || fieldxy.x != 2)) {
GuiShowTooltips(this, STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP, 0, NULL, TCC_HOVER); GuiShowTooltips(this, STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP, 0, NULL, close_cond);
} }
return; return true;
default: default:
break; break;
@ -2788,8 +2788,11 @@ struct IndustryCargoesWindow : public Window {
const CargoSpec *csp = CargoSpec::Get(cid); const CargoSpec *csp = CargoSpec::Get(cid);
uint64 params[5]; uint64 params[5];
params[0] = csp->name; params[0] = csp->name;
GuiShowTooltips(this, STR_INDUSTRY_CARGOES_CARGO_TOOLTIP, 1, params, TCC_HOVER); GuiShowTooltips(this, STR_INDUSTRY_CARGOES_CARGO_TOOLTIP, 1, params, close_cond);
return true;
} }
return false;
} }
virtual void OnResize() virtual void OnResize()