From 0e7380599e6b9bd31b0f0dec3abf920303760f61 Mon Sep 17 00:00:00 2001 From: ulukyn Date: Thu, 16 Aug 2018 18:44:22 +0200 Subject: [PATCH] Added: Ctrl DB Sheet tooltip can be overwrited --HG-- branch : patches-from-atys --- code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index a1ab7b318..50cdea91e 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -3150,12 +3150,16 @@ void CDBCtrlSheet::getContextHelp(ucstring &help) const getInventory().addItemInfoWaiter(&ControlSheetTooltipUpdater); } - help = ControlSheetTooltipUpdater.infoValidated(ctrlSheet, luaMethodName); - + if (!_ContextHelp.empty()) + help= _ContextHelp; + else + help = ControlSheetTooltipUpdater.infoValidated(ctrlSheet, luaMethodName); } else - help= getItemActualName(); - + if (!_ContextHelp.empty()) + help= _ContextHelp; + else + help= getItemActualName(); } else help= _ContextHelp;