diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/llui/lluictrl.h | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 6dfbd9cf8b..2b9caa2a82 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -145,6 +145,9 @@ public: Optional<EnableCallbackParam> validate_callback; Optional<CommitCallbackParam> rightclick_callback; + + Optional<CommitCallbackParam> mouseenter_callback; + Optional<CommitCallbackParam> mouseleave_callback; Optional<focus_callback_t> focus_lost_callback; @@ -181,6 +184,8 @@ public: /*virtual*/ BOOL isCtrl() const; /*virtual*/ void setTentative(BOOL b); /*virtual*/ BOOL getTentative() const; + /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); + /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); // From LLFocusableElement /*virtual*/ void setFocus( BOOL b ); @@ -246,6 +251,9 @@ public: boost::signals2::connection setCommitCallback( const commit_signal_t::slot_type& cb ) { return mCommitSignal.connect(cb); } boost::signals2::connection setValidateCallback( const enable_signal_t::slot_type& cb ) { return mValidateSignal.connect(cb); } + + boost::signals2::connection setMouseEnterCallback( const commit_signal_t::slot_type& cb ) { return mMouseEnterSignal.connect(cb); } + boost::signals2::connection setMouseLeaveCallback( const commit_signal_t::slot_type& cb ) { return mMouseLeaveSignal.connect(cb); } // *TODO: Deprecate; for backwards compatability only: boost::signals2::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data); @@ -275,6 +283,9 @@ protected: enable_signal_t mValidateSignal; commit_signal_t mRightClickSignal; + commit_signal_t mMouseEnterSignal; + commit_signal_t mMouseLeaveSignal; + LLViewModelPtr mViewModel; LLControlVariable* mControlVariable; |