diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 6e2cc39a06a69fa471b0ea2b56ecf9c448966e35..62b3ee3093bbb40e228a76cdc6a6575210ba6c12 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -38,6 +38,7 @@
#include "lluicolortable.h"
#include "message.h"
#include "llnotificationsutil.h"
+
LLNotificationListItem::LLNotificationListItem(const Params& p) : LLPanel(p),
mParams(p),
mTitleBox(NULL),
@@ -48,7 +49,8 @@ LLNotificationListItem::LLNotificationListItem(const Params& p) : LLPanel(p),
mExpandedViewPanel(NULL),
mCondensedHeight(0),
mExpandedHeight(0),
- mExpandedHeightResize(0)
+ mExpandedHeightResize(0),
+ mExpanded(false)
{
mNotificationName = p.notification_name;
}
@@ -58,7 +60,7 @@ BOOL LLNotificationListItem::postBuild()
BOOL rv = LLPanel::postBuild();
mTitleBox = getChild<LLTextBox>("notification_title");
mTitleBoxExp = getChild<LLTextBox>("notification_title_exp");
- mNoticeTextExp = getChild<LLViewerTextEditor>("notification_text_exp");
+ mNoticeTextExp = getChild<LLChatEntry>("notification_text_exp");
mTimeBox = getChild<LLTextBox>("notification_time");
mTimeBoxExp = getChild<LLTextBox>("notification_time_exp");
@@ -70,6 +72,8 @@ BOOL LLNotificationListItem::postBuild()
mTitleBox->setValue(mParams.title);
mTitleBoxExp->setValue(mParams.title);
mNoticeTextExp->setValue(mParams.title);
+ mNoticeTextExp->setEnabled(FALSE);
+ mNoticeTextExp->setTextExpandedCallback(boost::bind(&LLNotificationListItem::reshapeNotification, this));
mTimeBox->setValue(buildNotificationDate(mParams.time_stamp));
mTimeBoxExp->setValue(buildNotificationDate(mParams.time_stamp));
@@ -206,19 +210,31 @@ void LLNotificationListItem::onClickCondenseBtn()
setExpanded(FALSE);
}
+void LLNotificationListItem::reshapeNotification()
+{
+ if(mExpanded)
+ {
+ S32 width = this->getRect().getWidth();
+ this->reshape(width, mNoticeTextExp->getRect().getHeight() + mExpandedHeight, FALSE);
+ }
+}
+
void LLNotificationListItem::setExpanded(BOOL value)
{
mCondensedViewPanel->setVisible(!value);
mExpandedViewPanel->setVisible(value);
S32 width = this->getRect().getWidth();
+
if (value)
{
- this->reshape(width, mExpandedHeight + mExpandedHeightResize, FALSE);
+ this->reshape(width, mNoticeTextExp->getRect().getHeight() + mExpandedHeight, FALSE);
}
else
{
this->reshape(width, mCondensedHeight, FALSE);
}
+ mExpanded = value;
+
}
std::set<std::string> LLGroupInviteNotificationListItem::getTypes()
diff --git a/indra/newview/llnotificationlistitem.h b/indra/newview/llnotificationlistitem.h
index 950b75c39a8920fcd720904a84a42ec1dd3d157d..9a4ce2be4b5f670194db70664cc0bb125724fa51 100644
--- a/indra/newview/llnotificationlistitem.h
+++ b/indra/newview/llnotificationlistitem.h
@@ -34,7 +34,7 @@
#include "llbutton.h"
#include "llgroupiconctrl.h"
#include "llavatariconctrl.h"
-
+#include "llchatentry.h"
#include "llgroupmgr.h"
#include "llviewermessage.h"
@@ -93,6 +93,7 @@ public:
virtual bool showPopup() { return true; }
void setExpanded(BOOL value);
virtual BOOL postBuild();
+ void reshapeNotification();
typedef enum e_time_type
{
@@ -114,7 +115,7 @@ protected:
Params mParams;
LLTextBox* mTitleBox;
LLTextBox* mTitleBoxExp;
- LLViewerTextEditor* mNoticeTextExp;
+ LLChatEntry* mNoticeTextExp;
LLTextBox* mTimeBox;
LLTextBox* mTimeBoxExp;
LLButton* mExpandBtn;
@@ -128,6 +129,7 @@ protected:
S32 mCondensedHeight;
S32 mExpandedHeight;
S32 mExpandedHeightResize;
+ bool mExpanded;
};
class LLGroupNotificationListItem
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index b18c6b1e82083bb8aea7ef566333ae5396435667..afc609de5249eaec781e9ada673dade08a913556 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -8,8 +8,9 @@
save_rect="true"
title="NOTIFICATIONS"
width="350"
- min_width="320"
+ min_width="435"
height="550"
+ min_height="150"
can_minimize="false"
can_tear_off="false"
can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index 73f90f73aaff7dff9b24a4a84fb88f8c70a78ece..0c173261a30022475fedf147ef42303ec9ebe544 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -33,7 +33,7 @@
</panel.string>
<panel.string
name="item_expanded_height">
- 175
+ 87
</panel.string>
<panel.string
name="expanded_height_resize_for_attachment">
@@ -91,9 +91,7 @@
</layout_panel>
<layout_panel width="230" height="196" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_middle_exp">
<panel border="false" top="0" width="230" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel_expanded">
- <layout_stack top="0" left="0" width="230" height="196" orientation="vertical" follows="left|top|right|bottom" name="main_info_panel_vertical_stack">
- <layout_panel top="0" left="0" width="230" height="30" layout="topleft" follows="left|top|right|bottom" name="notification_title_layout_panel" visible="true">
- <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp" >
+ <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp" >
<text allow_scroll="false" font="SansSerif" top="6" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
use_ellipses="true" word_wrap="false" mouse_opaque="false" name="notification_title_exp">
Notice Title Notice Title N o t i c e T i t l e N o t i c e T i t l e
@@ -103,7 +101,7 @@
Group Name Group Name Group Na m e e
</text>
</panel>
- <panel border="false" left="0" width="230" height="12" bevel_style="none" follows="left|top|right" layout="topleft" name="sender_time_panel_exp">
+ <panel border="false" left="0" width="230" height="15" bevel_style="none" follows="left|top|right" layout="topleft" name="sender_time_panel_exp">
<text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="145" height="13" layout="topleft" follows="right|left"
use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box_exp" visible="false">
Sender: "Resident R e s i d e n t R e s i d e n t"
@@ -111,11 +109,11 @@
<text allow_scroll="false" font="SansSerifSmall" top="0" right="-1" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
name="notification_time_exp" value="2014/12/24 23:30" />
</panel>
- <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_text_panel_exp" visible="true">
- <text_editor enabled="false" top="0" left="0" width="230" height="110" layout="topleft" follows="left|top|right|bottom"
+ <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="left|right" layout="topleft" name="notification_text_panel_exp" visible="true">
+ <chat_editor is_expandable="true" top="0" left="0" width="230" height="110" layout="topleft" follows="left|right"
word_wrap="true" max_length="65536" name="notification_text_exp" parse_urls="true">
Notice text goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla .
- </text_editor>
+ </chat_editor>
</panel>
<panel border="false" left="1" bottom="-5" width="230" height="22" bevel_style="none" follows="left|right|bottom" layout="topleft" name="attachment_panel" visible="false">
<text allow_scroll="false" font="SansSerifSmall" top="4" left="5" width="220" height="12" layout="topleft" follows="left|top|right|bottom"
@@ -123,13 +121,11 @@
Attachment goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla .
</text>
</panel>
- <panel border="false" left="0" bottom="-4" height="30" bevel_style="none" follows="left|right|bottom" layout="topleft" name="button_panel" visible="false">
+ <panel border="false" left="1" bottom="-5" height="55" bevel_style="none" follows="left|right|bottom" layout="topleft" name="button_panel" visible="false">
<button top="2" left="0" width="65" height="23" layout="topleft" follows="left|top|bottom" name="join_btn" mouse_opaque="true" tab_stop="false" label = "Join"/>
<button top="2" left_pad="12" width="65" height="23" layout="topleft" follows="left|top|bottom" name="decline_btn" mouse_opaque="true" tab_stop="false" label = "Decline"/>
<button top="2" left_pad="12" width="65" height="23" layout="topleft" follows="left|top|bottom" name="info_btn" mouse_opaque="true" tab_stop="false" label = "Info"/>
</panel>
- </layout_panel>
- </layout_stack>
</panel>
</layout_panel>
<layout_panel width="18" orientation="horizontal" follows="right|top|bottom" name="layout_panel_left_exp">