diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
| commit | b1e063fe8c339c339a5d154e2f48fb8accf6f71c (patch) | |
| tree | 02322319b2106e1cb9d6d998e23d3fcd753dadd1 /indra/newview/lljoystickbutton.h | |
| parent | 09802fa8ea9c8459e13a32720088f6d6fb1ad42d (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-512
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
| -rw-r--r-- | indra/newview/lljoystickbutton.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index ee66088b56..b7fdf63e58 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -80,7 +80,8 @@ public: * Image containing circle is square and this square has adherent points with joystick * circle. Make sure to change method according to shape other than square. */ - bool pointInCircle(S32 x, S32 y) const; + bool pointInCircle(S32 x, S32 y) const; + bool pointInCenterDot(S32 x, S32 y, S32 radius) const; static std::string nameFromQuadrant(const EJoystickQuadrant quadrant); static EJoystickQuadrant quadrantFromName(const std::string& name); @@ -148,7 +149,9 @@ public: virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); + virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual void onHeldDown(); + virtual void resetJoystickCamera(); virtual void draw(); protected: @@ -161,6 +164,9 @@ protected: BOOL mInTop; BOOL mInRight; BOOL mInBottom; + BOOL mInCenter; + + std::string mCenterImageName; }; @@ -177,6 +183,7 @@ public: LLJoystickCameraTrack(const LLJoystickCameraTrack::Params&); virtual void onHeldDown(); + virtual void resetJoystickCamera(); }; // |