diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-04-20 07:19:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 07:19:26 -0700 |
| commit | a7eef57c1f3f8cd0850bd33b99f150d0e20d3e88 (patch) | |
| tree | 09aeef796ca232ad1856d918c14eba34b3b4165c /indra/llui/llbutton.h | |
| parent | dc5ef88e314d201f8f15be33d3517f45c4af2878 (diff) | |
| parent | 97b0ba2a6d2596da867043077e32065653d44f6e (diff) | |
Merge pull request #183 from secondlife/SL-19575a
SL-19575 LLFloaterEmojiPicker - Add filter by category
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index ccd31e90c0..257159f64f 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -73,6 +73,7 @@ public: Optional<bool> label_shadow; Optional<bool> auto_resize; Optional<bool> use_ellipses; + Optional<bool> use_font_color; // images Optional<LLUIImage*> image_unselected, @@ -174,6 +175,7 @@ public: void setUnselectedLabelColor( const LLColor4& c ) { mUnselectedLabelColor = c; } void setSelectedLabelColor( const LLColor4& c ) { mSelectedLabelColor = c; } void setUseEllipses( BOOL use_ellipses ) { mUseEllipses = use_ellipses; } + void setUseFontColor( BOOL use_font_color) { mUseFontColor = use_font_color; } boost::signals2::connection setClickedCallback(const CommitCallbackParam& cb); @@ -238,6 +240,8 @@ public: void autoResize(); // resize with label of current btn state void resize(LLUIString label); // resize with label input + void setLabel(const std::string& label); + void setLabel(const LLUIString& label); void setLabel( const LLStringExplicit& label); virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ); void setLabelUnselected(const LLStringExplicit& label); @@ -353,6 +357,7 @@ protected: bool mDropShadowedText; bool mAutoResize; bool mUseEllipses; + bool mUseFontColor; bool mBorderEnabled; bool mFlashing; |