From cd7d499ea779178d49be65d37e852712f82c3c90 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 28 Jun 2012 17:22:00 +0300
Subject: [PATCH] CHUI-168 FIXED, CHUI-183 FIXED Supress of a resizable and
dragging and hide a title for the docked floater
---
indra/newview/llimconversation.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index dc68c5cea19..acdd7ba46a5 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -250,14 +250,16 @@ void LLIMConversation::updateHeaderAndToolbar()
bool is_expanded = is_hosted || is_participant_list_visible;
mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));
- // The button (>>) should be disabled for torn off P2P conversations.
- mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat);
-
+ // toggle floater's drag handle and title visibility
if (mDragHandle)
{
- // toggle floater's drag handle and title visibility
- mDragHandle->setVisible(!is_hosted);
+ mDragHandle->setTitleVisible(!is_hosted);
+ setCanDrag(!is_hosted);
}
+ setCanResize(!is_hosted);
+
+ // The button (>>) should be disabled for torn off P2P conversations.
+ mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat);
mTearOffBtn->setImageOverlay(getString(is_hosted ? "tear_off_icon" : "return_icon"));
@@ -347,6 +349,8 @@ void LLIMConversation::onOpen(const LLSD& key)
host_floater->collapseMessagesPane(false);
}
+ setCanResize(TRUE);
+
updateHeaderAndToolbar();
}
--
GitLab