diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
| commit | b43771cad585cb9820941eb1b24b67390eaa9435 (patch) | |
| tree | 322e5f94a1fa473ad4e8c0b343974a72e824f66a /indra/newview/llbottomtray.h | |
| parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index cc35e63524..a28f1e42ec 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -69,6 +69,8 @@ public: virtual void sessionRemoved(const LLUUID& session_id); void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); + virtual void reshape(S32 width, S32 height, BOOL called_from_parent); + virtual void onFocusLost(); virtual void setVisible(BOOL visible); @@ -81,6 +83,18 @@ public: private: + enum EResizeState + { + STATE_CHICLET_PANEL = 1, + STATE_CHATBAR_INPUT, + STATE_BUTTONS + }; + + void updateResizeState(S32 width, S32 height); + void verifyChildControlsSizes(); + + EResizeState mResizeState; + protected: LLBottomTray(const LLSD& key = LLSD()); @@ -103,7 +117,9 @@ protected: LLPanel* mMovementPanel; LLPanel* mCamPanel; LLPanel* mSnapshotPanel; - LLComboBox* mGestureCombo; + LLPanel* mGesturePanel; + LLButton* mCamButton; + LLButton* mMovementButton; }; #endif // LL_LLBOTTOMPANEL_H |