diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-16 01:08:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 01:08:13 +0300 |
| commit | d41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch) | |
| tree | 3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /indra/llui/llxyvector.h | |
| parent | 29be88d60d654193926add496d2d851f7c217356 (diff) | |
| parent | bdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff) | |
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette merge
Diffstat (limited to 'indra/llui/llxyvector.h')
| -rw-r--r-- | indra/llui/llxyvector.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/indra/llui/llxyvector.h b/indra/llui/llxyvector.h index bb3822dd26..6bebf347e8 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; @@ -68,15 +68,15 @@ public: virtual ~LLXYVector(); /*virtual*/ BOOL postBuild(); - 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); + 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); - virtual void draw(); + virtual void draw(); - virtual void setValue(const LLSD& value); - void setValue(F32 x, F32 y); - virtual LLSD getValue() const; + virtual void setValue(const LLSD& value); + void setValue(F32 x, F32 y); + virtual LLSD getValue() const; 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(); |