From c6863d18d7c981756c57bbcd52baa06af00d1551 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Thu, 13 Sep 2012 19:10:28 -0700 Subject: CHUI-283: Now upon the information icon and speaker icon do not overlap the username text. Instead the username text will be truncated with an ellipse to prevent the overlap. Also did a code cleanup. --- indra/newview/llconversationview.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'indra/newview/llconversationview.h') diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 0dcf6542a3..686a79ad39 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -29,12 +29,6 @@ #include "llfolderviewitem.h" - - - -#include "llstyle.h" -#include "llcallbackmap.h" -#include "lltextbox.h" #include "llbutton.h" #include "lloutputmonitorctrl.h" @@ -71,8 +65,6 @@ public: // Implementation of conversations list participant (avatar) widgets -class LLAvatarIconCtrl; - class LLConversationViewParticipant : public LLFolderViewItem { @@ -108,6 +100,18 @@ private: LLButton * mInfoBtn; LLOutputMonitorCtrl* mSpeakingIndicator; LLUUID mUUID; // UUID of the participant + + typedef enum e_avatar_item_child { + ALIC_SPEAKER_INDICATOR, + ALIC_INFO_BUTTON, + ALIC_COUNT, + } EAvatarListItemChildIndex; + + static bool sStaticInitialized; // this variable is introduced to improve code readability + static S32 sChildrenWidths[ALIC_COUNT]; + static void initChildrenWidths(LLConversationViewParticipant* self); + void computeLabelRightPadding(); + LLView* getItemChildView(EAvatarListItemChildIndex child_view_index); }; #endif // LL_LLCONVERSATIONVIEW_H -- cgit v1.2.3