diff options
Diffstat (limited to 'indra/llui/llxyvector.h')
| -rw-r--r-- | indra/llui/llxyvector.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/indra/llui/llxyvector.h b/indra/llui/llxyvector.h index bb3822dd26..646771f387 100644 --- a/indra/llui/llxyvector.h +++ b/indra/llui/llxyvector.h @@ -25,7 +25,7 @@ * $/LicenseInfo$ */ -// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane. +// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane. #ifndef LL_LLXYVECTOR_H #define LL_LLXYVECTOR_H @@ -42,13 +42,13 @@ public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<LLLineEditor::Params> x_entry; - Optional<LLLineEditor::Params> y_entry; - Optional<LLPanel::Params> touch_area; - Optional<LLViewBorder::Params> border; - Optional<S32> edit_bar_height; - Optional<S32> padding; - Optional<S32> label_width; + Optional<LLLineEditor::Params> x_entry; + Optional<LLLineEditor::Params> y_entry; + Optional<LLPanel::Params> touch_area; + Optional<LLViewBorder::Params> border; + Optional<S32> edit_bar_height; + Optional<S32> padding; + Optional<S32> label_width; Optional<F32> min_val_x; Optional<F32> max_val_x; Optional<F32> increment_x; @@ -59,24 +59,24 @@ public: Optional<LLUIColor> ghost_color; Optional<LLUIColor> area_color; Optional<LLUIColor> grid_color; - Optional<BOOL> logarithmic; + Optional<bool> logarithmic; Params(); }; - virtual ~LLXYVector(); - /*virtual*/ BOOL postBuild(); + ~LLXYVector() override; + bool postBuild() override; - virtual BOOL handleHover(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + bool handleHover(S32 x, S32 y, MASK mask) override; + bool handleMouseUp(S32 x, S32 y, MASK mask) override; + bool handleMouseDown(S32 x, S32 y, MASK mask) override; - virtual void draw(); + void draw() override; - virtual void setValue(const LLSD& value); - void setValue(F32 x, F32 y); - virtual LLSD getValue() const; + void setValue(const LLSD& value) override; + void setValue(F32 x, F32 y); + LLSD getValue() const override; protected: friend class LLUICtrlFactory; @@ -86,10 +86,10 @@ protected: protected: LLTextBox* mXLabel; LLTextBox* mYLabel; - LLLineEditor* mXEntry; - LLLineEditor* mYEntry; + LLLineEditor* mXEntry; + LLLineEditor* mYEntry; LLPanel* mTouchArea; - LLViewBorder* mBorder; + LLViewBorder* mBorder; private: void update(); @@ -113,7 +113,7 @@ private: LLUIColor mAreaColor; LLUIColor mGridColor; - BOOL mLogarithmic; + bool mLogarithmic; F32 mLogScaleX; F32 mLogScaleY; }; |