diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llscreenchannel.h | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llscreenchannel.h')
| -rw-r--r-- | indra/newview/llscreenchannel.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index 5a9946f772..f05c205e2a 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -54,14 +54,15 @@ typedef enum e_notification_toast_alignment */ class LLScreenChannel : public LLUICtrl { + friend class LLChannelManager; public: LLScreenChannel(); virtual ~LLScreenChannel(); void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - LLToast* addToast(LLUUID id, LLPanel* panel); - void init(S32 channel_position, LLView* root_view); + LLToast* addToast(LLUUID id, LLPanel* panel, bool is_not_tip = true); + void init(S32 channel_left, S32 channel_right); void killToastByNotificationID(LLUUID id); void modifyToastByNotificationID(LLUUID id, LLPanel* panel); @@ -79,8 +80,15 @@ public: void showToasts(); + S32 getNumberOfHiddenToasts() { return mHiddenToastsNum;} + void setNumberOfHiddenToasts(S32 num) { mHiddenToastsNum = num;} + + static void setStartUpToastShown() { mWasStartUpToastShown = true; } + e_notification_toast_alignment getToastAlignment() {return mToastAlignment;} + void setOverflowFormatString ( std::string str) { mOverflowFormatString = str; } + private: struct ToastElem { @@ -117,9 +125,10 @@ private: void showToastsCentre(); void showToastsTop(); - void createOverflowToast(S32 bottom); + void createOverflowToast(S32 bottom, F32 timer = 0); void onOverflowToastHide(); + static bool mWasStartUpToastShown; bool mControlHovering; bool mIsHovering; bool mStoreToasts; @@ -130,6 +139,8 @@ private: std::vector<ToastElem> mStoredToastList; e_notification_toast_alignment mToastAlignment; std::map<LLToast*, bool> mToastEventStack; + + std::string mOverflowFormatString; }; } |