From 9382433931a9266bafa8dcd797d6f98cb80a7eaf Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Tue, 8 Jun 2010 23:02:54 +0300 Subject: EXT-5629 FIXED Made sensitivity of +/- zoom buttons from camera floater consistent with viewer 1.23 - Changed actions happening when minus or plus are held- now onSliderValueChanged() is not used for zoom via buttons. Zooming in and out now happens as it did in 1.23 in LLJoystickCameraZoom::onHeldDown(), but only "Zoom in slow" and Zoom out slow" were borrowed from there, because fast versions are not needed- they do not happen in 1.23. - Removed LLJoystickCameraZoom class, because it's not used anywhere. If need for it ever rises, it can be easily restored. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/530/ --HG-- branch : product-engine --- indra/newview/lljoystickbutton.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'indra/newview/lljoystickbutton.h') diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 2b071a8999..1dd30036ab 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -183,44 +183,4 @@ public: virtual void onHeldDown(); }; - -// Zoom the camera in and out -class LLJoystickCameraZoom -: public LLJoystick -{ -public: - struct Params - : public LLInitParam::Block - { - Optional plus_image; - Optional minus_image; - - Params() - : plus_image ("plus_image", NULL), - minus_image ("minus_image", NULL) - { - held_down_delay.seconds(0.0); - } - }; - LLJoystickCameraZoom(const Params&); - - virtual void setToggleState( BOOL top, BOOL bottom ); - - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual void onHeldDown(); - virtual void draw(); - -protected: - virtual void updateSlop(); - F32 getOrbitRate(); - -protected: - BOOL mInTop; - BOOL mInBottom; - LLUIImagePtr mPlusInImage; - LLUIImagePtr mMinusInImage; -}; - - - #endif // LL_LLJOYSTICKBUTTON_H -- cgit v1.2.3