From 45e8926f138a2b42c5054149d3a9f6f39df29247 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 28 Nov 2012 13:48:55 -0800
Subject: [PATCH] code cleanup: variables and functions were using the word
'minimized' to refer 'collapsed'. Renamed variables and functions to use the
word 'collapsed' instead of 'minimized'.
---
indra/newview/llconversationview.cpp | 16 ++++++++--------
indra/newview/llconversationview.h | 6 +++---
indra/newview/llfloaterimcontainer.cpp | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 3aadc2986f1..1b1d61e6d63 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -80,7 +80,7 @@ LLConversationViewSession::LLConversationViewSession(const LLConversationViewSes
mSessionTitle(NULL),
mSpeakingIndicator(NULL),
mVoiceClientObserver(NULL),
- mMinimizedMode(false),
+ mCollapsedMode(false),
mHasArrow(true)
{
mFlashTimer = new LLFlashTimer();
@@ -185,7 +185,7 @@ void LLConversationViewSession::draw()
const BOOL show_context = (getRoot() ? getRoot()->getShowSelectionContext() : FALSE);
// we don't draw the open folder arrow in minimized mode
- if (mHasArrow && !mMinimizedMode)
+ if (mHasArrow && !mCollapsedMode)
{
// update the rotation angle of open folder arrow
updateLabelRotation();
@@ -233,7 +233,7 @@ S32 LLConversationViewSession::arrange(S32* width, S32* height)
S32 h_pad = mHasArrow ? getIndentation() + mArrowSize : getIndentation();
- LLRect rect(mMinimizedMode ? getLocalRect().mLeft : h_pad,
+ LLRect rect(mCollapsedMode ? getLocalRect().mLeft : h_pad,
getLocalRect().mTop,
getLocalRect().mRight,
getLocalRect().mTop - getItemHeight());
@@ -246,7 +246,7 @@ S32 LLConversationViewSession::arrange(S32* width, S32* height)
void LLConversationViewSession::toggleOpen()
{
// conversations should not be opened while in minimized mode
- if (!mMinimizedMode)
+ if (!mCollapsedMode)
{
LLFolderViewFolder::toggleOpen();
@@ -259,17 +259,17 @@ void LLConversationViewSession::toggleOpen()
}
}
-void LLConversationViewSession::toggleMinimizedMode(bool is_minimized)
+void LLConversationViewSession::toggleCollapsedMode(bool is_collapsed)
{
- mMinimizedMode = is_minimized;
+ mCollapsedMode = is_collapsed;
// hide the layout stack which contains all item's child widgets
// except for the icon which we display in minimized mode
- getChild<LLView>("conversation_item_stack")->setVisible(!mMinimizedMode);
+ getChild<LLView>("conversation_item_stack")->setVisible(!mCollapsedMode);
S32 h_pad = mHasArrow ? getIndentation() + mArrowSize : getIndentation();
- mItemPanel->translate(mMinimizedMode ? -h_pad : h_pad, 0);
+ mItemPanel->translate(mCollapsedMode ? -h_pad : h_pad, 0);
}
void LLConversationViewSession::setVisibleIfDetached(BOOL visible)
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index c6cb5023558..a6f408403b0 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -72,9 +72,9 @@ class LLConversationViewSession : public LLFolderViewFolder
/*virtual*/ void toggleOpen();
- /*virtual*/ bool isMinimized() { return mMinimizedMode; }
+ /*virtual*/ bool isCollapsed() { return mCollapsedMode; }
- void toggleMinimizedMode(bool is_minimized);
+ void toggleCollapsedMode(bool is_collapsed);
void setVisibleIfDetached(BOOL visible);
LLConversationViewParticipant* findParticipant(const LLUUID& participant_id);
@@ -95,7 +95,7 @@ class LLConversationViewSession : public LLFolderViewFolder
LLOutputMonitorCtrl* mSpeakingIndicator;
LLFlashTimer* mFlashTimer;
- bool mMinimizedMode;
+ bool mCollapsedMode;
bool mHasArrow;
LLVoiceClientStatusObserver* mVoiceClientObserver;
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 5fbbfd12830..a04b8d79d60 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -640,7 +640,7 @@ void LLFloaterIMContainer::collapseConversationsPane(bool collapse)
LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(widget_it->second);
if (widget)
{
- widget->toggleMinimizedMode(collapse);
+ widget->toggleCollapsedMode(collapse);
// force closing all open conversations when collapsing to minimized state
if (collapse)
@@ -1320,7 +1320,7 @@ LLConversationItem* LLFloaterIMContainer::addConversationListItem(const LLUUID&
}
// set the widget to minimized mode if conversations pane is collapsed
- widget->toggleMinimizedMode(mConversationsPane->isCollapsed());
+ widget->toggleCollapsedMode(mConversationsPane->isCollapsed());
if (isWidgetSelected)
{
--
GitLab