Skip to content
Snippets Groups Projects
Commit 2c2e8b83 authored by AlexanderP ProductEngine's avatar AlexanderP ProductEngine
Browse files

CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not possible to...

CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not possible to collapse the right side of the conversation dialog: the toolbar is completely missing and the "<<" chevrons are not there): This was because the button "<<" belonged session's floater and not the container. Therefore, when all the floaters in the stack becomes invisible, their buttons also become invisible. Solution: Added additional button "<<" in the stub_panel of the container.
parent 09570f1e
Branches
Tags
No related merge requests found
...@@ -205,6 +205,8 @@ BOOL LLFloaterIMContainer::postBuild() ...@@ -205,6 +205,8 @@ BOOL LLFloaterIMContainer::postBuild()
mExpandCollapseBtn = getChild<LLButton>("expand_collapse_btn"); mExpandCollapseBtn = getChild<LLButton>("expand_collapse_btn");
mExpandCollapseBtn->setClickedCallback(boost::bind(&LLFloaterIMContainer::onExpandCollapseButtonClicked, this)); mExpandCollapseBtn->setClickedCallback(boost::bind(&LLFloaterIMContainer::onExpandCollapseButtonClicked, this));
mStubCollapseBtn = getChild<LLButton>("stub_collapse_btn");
mStubCollapseBtn->setClickedCallback(boost::bind(&LLFloaterIMContainer::onStubCollapseButtonClicked, this));
childSetAction("add_btn", boost::bind(&LLFloaterIMContainer::onAddButtonClicked, this)); childSetAction("add_btn", boost::bind(&LLFloaterIMContainer::onAddButtonClicked, this));
...@@ -335,6 +337,11 @@ void LLFloaterIMContainer::onNewMessageReceived(const LLSD& data) ...@@ -335,6 +337,11 @@ void LLFloaterIMContainer::onNewMessageReceived(const LLSD& data)
} }
} }
void LLFloaterIMContainer::onStubCollapseButtonClicked()
{
collapseMessagesPane(true);
}
void LLFloaterIMContainer::onExpandCollapseButtonClicked() void LLFloaterIMContainer::onExpandCollapseButtonClicked()
{ {
if (mConversationsPane->isCollapsed() && mMessagesPane->isCollapsed() if (mConversationsPane->isCollapsed() && mMessagesPane->isCollapsed()
......
...@@ -109,6 +109,7 @@ class LLFloaterIMContainer ...@@ -109,6 +109,7 @@ class LLFloaterIMContainer
void onNewMessageReceived(const LLSD& data); void onNewMessageReceived(const LLSD& data);
void onExpandCollapseButtonClicked(); void onExpandCollapseButtonClicked();
void onStubCollapseButtonClicked();
void processParticipantsStyleUpdate(); void processParticipantsStyleUpdate();
void collapseConversationsPane(bool collapse); void collapseConversationsPane(bool collapse);
...@@ -147,6 +148,7 @@ class LLFloaterIMContainer ...@@ -147,6 +148,7 @@ class LLFloaterIMContainer
void openNearbyChat(); void openNearbyChat();
LLButton* mExpandCollapseBtn; LLButton* mExpandCollapseBtn;
LLButton* mStubCollapseBtn;
LLPanel* mStubPanel; LLPanel* mStubPanel;
LLTextBox* mStubTextBox; LLTextBox* mStubTextBox;
LLLayoutPanel* mMessagesPane; LLLayoutPanel* mMessagesPane;
......
...@@ -134,6 +134,19 @@ ...@@ -134,6 +134,19 @@
left="0" left="0"
height="430" height="430"
width="412"> width="412">
<button
follows="right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Conv_toolbar_collapse"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
top="5"
right="-10"
name="stub_collapse_btn"
tool_tip="Collapse this pane"
width="31" />
<text <text
type="string" type="string"
clip_partial="false" clip_partial="false"
...@@ -142,7 +155,7 @@ ...@@ -142,7 +155,7 @@
left="20" left="20"
right="-20" right="-20"
name="stub_textbox_1" name="stub_textbox_1"
top="10" top="30"
height="20" height="20"
valign="center" valign="center"
wrap="true"> wrap="true">
...@@ -156,7 +169,7 @@ ...@@ -156,7 +169,7 @@
left="20" left="20"
right="-20" right="-20"
name="stub_textbox_2" name="stub_textbox_2"
top="40" top="60"
height="20" height="20"
valign="center" valign="center"
parse_urls="true" parse_urls="true"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment