Skip to content
Snippets Groups Projects
Commit d24cd96e authored by Lynx Linden's avatar Lynx Linden
Browse files

EXT-3929: Also look in accordion tabs for help topic.

When the user clicks on the help "?" button, we try to find the
currently active tab and see if there is a help topic for that tab.
In addition, we now also look for a currently-visible accordion tab.
parent a4baeed1
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "llerror.h" #include "llerror.h"
#include "lltimer.h" #include "lltimer.h"
#include "llaccordionctrltab.h"
#include "llbutton.h" #include "llbutton.h"
#include "llmenugl.h" #include "llmenugl.h"
//#include "llstatusbar.h" //#include "llstatusbar.h"
...@@ -851,14 +852,26 @@ static LLPanel *childGetVisibleTabWithHelp(LLView *parent) ...@@ -851,14 +852,26 @@ static LLPanel *childGetVisibleTabWithHelp(LLView *parent)
// look through immediate children first for an active tab with help // look through immediate children first for an active tab with help
for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child)) for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
{ {
LLPanel *curTabPanel = NULL;
// do we have a tab container?
LLTabContainer *tab = dynamic_cast<LLTabContainer *>(child); LLTabContainer *tab = dynamic_cast<LLTabContainer *>(child);
if (tab && tab->getVisible()) if (tab && tab->getVisible())
{ {
LLPanel *curTabPanel = tab->getCurrentPanel(); curTabPanel = tab->getCurrentPanel();
if (curTabPanel && !curTabPanel->getHelpTopic().empty()) }
{
return curTabPanel; // do we have an accordion tab?
} LLAccordionCtrlTab* accordion = dynamic_cast<LLAccordionCtrlTab *>(child);
if (accordion && accordion->getDisplayChildren())
{
curTabPanel = dynamic_cast<LLPanel *>(accordion->getAccordionView());
}
// if we found a valid tab, does it have a help topic?
if (curTabPanel && !curTabPanel->getHelpTopic().empty())
{
return curTabPanel;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment