livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACME-251 Create AvatarFolderItemView: Adding in code to make the persontab's function more like accordiontabs

meow-7.2.2
Gilbert Gonzales 2013-04-24 17:41:49 -07:00
parent 4921c65493
commit 1787988c47
5 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelpeople.cpp
View File

@ -753,7 +753,6 @@ BOOL LLPanelPeople::postBuild()
mConversationsRoot->setFollowsAll();
//Create a session
//LLSpeakerMgr* speaker_manager = (LLSpeakerMgr*)LLLocalSpeakerMgr::getInstance();
LLPersonTabModel* item = new LLPersonTabModel("Facebook Friends", mPersonFolderViewModel);
LLPersonTabView::Params params;
params.name = item->getDisplayName();
@ -763,6 +762,18 @@ BOOL LLPanelPeople::postBuild()
LLPersonTabView * widget = LLUICtrlFactory::create<LLPersonTabView>(params);
widget->addToFolder(mConversationsRoot);
mConversationsRoot->mPersonFolderModelMap[item->getID()] = item;
mConversationsRoot->mPersonFolderViewMap[item->getID()] = widget;
//Create a session
item = new LLPersonTabModel("Facebook Friends Tab Two", mPersonFolderViewModel);
params.name = item->getDisplayName();
params.root = mConversationsRoot;
params.listener = item;
params.tool_tip = params.name;
widget = LLUICtrlFactory::create<LLPersonTabView>(params);
widget->addToFolder(mConversationsRoot);
mConversationsRoot->mPersonFolderModelMap[item->getID()] = item;
mConversationsRoot->mPersonFolderViewMap[item->getID()] = widget;

19
indra/newview/llpersonfolderview.cpp
View File

@ -45,6 +45,25 @@ LLPersonFolderView::~LLPersonFolderView()
mConversationsEventStream.stopListening("ConversationsRefresh");
}
BOOL LLPersonFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
{
LLFolderViewItem * prior_item = getCurSelectedItem();
LLFolderViewItem * current_item;
bool selected_item = LLFolderView::handleMouseDown(x, y, mask);
current_item = getCurSelectedItem();
LLPersonTabView * prior_folder = dynamic_cast<LLPersonTabView *>(prior_item);
if(prior_folder && current_item != prior_folder)
{
prior_folder->highlight = false;
}
return selected_item;
}
bool LLPersonFolderView::onConversationModelEvent(const LLSD &event)
{
std::string type = event.get("type").asString();

3
indra/newview/llpersonfolderview.h
View File

@ -51,9 +51,10 @@ public:
~LLPersonFolderView();
bool onConversationModelEvent(const LLSD &event);
LLPersonView * createConversationViewParticipant(LLPersonModel * item);
BOOL handleMouseDown( S32 x, S32 y, MASK mask );
person_folder_model_map mPersonFolderModelMap;
person_folder_view_map mPersonFolderViewMap;
LLEventStream mConversationsEventStream;

17
indra/newview/llpersontabview.cpp
View File

@ -37,7 +37,8 @@ LLPersonTabView::Params::Params()
{}
LLPersonTabView::LLPersonTabView(const LLPersonTabView::Params& p) :
LLFolderViewFolder(p)
LLFolderViewFolder(p),
highlight(false)
{
}
@ -52,6 +53,18 @@ LLPersonTabView::~LLPersonTabView()
}
BOOL LLPersonTabView::handleMouseDown( S32 x, S32 y, MASK mask )
{
bool selected_item = LLFolderViewFolder::handleMouseDown(x, y, mask);
if(selected_item)
{
highlight = true;
}
return selected_item;
}
void LLPersonTabView::draw()
{
static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
@ -68,7 +81,7 @@ void LLPersonTabView::draw()
LLColor4 color = sFgColor;
F32 right_x = 0;
drawHighlight(false, mIsSelected, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
drawHighlight(false, highlight, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
updateLabelRotation();
drawOpenFolderArrow(default_params, sFgColor);

2
indra/newview/llpersontabview.h
View File

@ -44,7 +44,9 @@ public:
virtual ~LLPersonTabView();
S32 getLabelXPos();
bool highlight;
BOOL handleMouseDown( S32 x, S32 y, MASK mask );
protected:
void draw();