summaryrefslogtreecommitdiff
path: root/indra/newview/llsyswellwindow.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-16 12:16:24 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-16 12:16:24 -0500
commitace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch)
tree2d437342310d52806c6b378f1046ad56d9eb6456 /indra/newview/llsyswellwindow.cpp
parent90bb29245cbd9626f840f1d16c351ac415f7c35e (diff)
parent1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff)
merge with avp-tip
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
-rw-r--r--indra/newview/llsyswellwindow.cpp47
1 files changed, 47 insertions, 0 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 1ebf624eeb..ea49f9c32e 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -51,6 +51,7 @@
LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLDockableFloater(NULL, key),
mChannel(NULL),
mMessageList(NULL),
+ mSysWellChiclet(NULL),
mSeparator(NULL),
NOTIFICATION_WELL_ANCHOR_NAME("notification_well_panel"),
IM_WELL_ANCHOR_NAME("im_well_panel")
@@ -80,6 +81,10 @@ BOOL LLSysWellWindow::postBuild()
mMessageList->addItem(mSeparator);
+ // click on SysWell Window should clear "new message" state (and 'Lit' status). EXT-3147.
+ // mouse up callback is not called in this case.
+ setMouseDownCallback(boost::bind(&LLSysWellWindow::releaseNewMessagesState, this));
+
return LLDockableFloater::postBuild();
}
@@ -174,6 +179,11 @@ void LLSysWellWindow::setVisible(BOOL visible)
mChannel->updateShowToastsState();
mChannel->redrawToasts();
}
+
+ if (visible)
+ {
+ releaseNewMessagesState();
+ }
}
//---------------------------------------------------------------------------------
@@ -227,6 +237,14 @@ void LLSysWellWindow::reshapeWindow()
}
}
+void LLSysWellWindow::releaseNewMessagesState()
+{
+ if (NULL != mSysWellChiclet)
+ {
+ mSysWellChiclet->setNewMessagesState(false);
+ }
+}
+
//---------------------------------------------------------------------------------
bool LLSysWellWindow::isWindowEmpty()
{
@@ -246,6 +264,24 @@ void LLSysWellWindow::handleItemAdded(EItemType added_item_type)
// refresh list to recalculate mSeparator position
mMessageList->reshape(mMessageList->getRect().getWidth(), mMessageList->getRect().getHeight());
}
+
+ //fix for EXT-3254
+ //set limits for min_height.
+ S32 parent_list_delta_height = getRect().getHeight() - mMessageList->getRect().getHeight();
+
+ std::vector<LLPanel*> items;
+ mMessageList->getItems(items);
+
+ if(items.size()>1)//first item is separator
+ {
+ S32 min_height;
+ S32 min_width;
+ getResizeLimits(&min_width,&min_height);
+
+ min_height = items[1]->getRect().getHeight() + 2 * mMessageList->getBorderWidth() + parent_list_delta_height;
+
+ setResizeLimits(min_width,min_height);
+ }
}
void LLSysWellWindow::handleItemRemoved(EItemType removed_item_type)
@@ -752,6 +788,13 @@ void LLIMWellWindow::addIMRow(const LLUUID& sessionId, S32 chicletCounter,
//---------------------------------------------------------------------------------
void LLIMWellWindow::delIMRow(const LLUUID& sessionId)
{
+ //fix for EXT-3252
+ //without this line LLIMWellWindow receive onFocusLost
+ //and hide itself. It was becaue somehow LLIMChicklet was in focus group for
+ //LLIMWellWindow...
+ //But I didn't find why this happen..
+ gFocusMgr.clearLastFocusForGroup(this);
+
if (mMessageList->removeItemByValue(sessionId))
{
handleItemRemoved(IT_INSTANT_MESSAGE);
@@ -771,6 +814,10 @@ void LLIMWellWindow::delIMRow(const LLUUID& sessionId)
{
setVisible(FALSE);
}
+ else
+ {
+ setFocus(true);
+ }
}
void LLIMWellWindow::addObjectRow(const LLUUID& object_id, bool new_message/* = false*/)