From 320b7bacc2ef34b1434178cce8eb2818493fec21 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 4 Dec 2018 18:51:44 +0200 Subject: SL-10149 FIXED 'Mute when minimized' checkbox is displayed without focus on it after pressing on label in the "Preferences" floater --- indra/llui/llcheckboxctrl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llui/llcheckboxctrl.h') diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 5ce45b2135..71bdc32e66 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -92,6 +92,8 @@ public: // LLCheckBoxCtrl interface virtual BOOL toggle() { return mButton->toggleState(); } // returns new state + void setBtnFocus() { mButton->setFocus(TRUE); } + void setEnabledColor( const LLColor4 &color ) { mTextEnabledColor = color; } void setDisabledColor( const LLColor4 &color ) { mTextDisabledColor = color; } -- cgit v1.2.3 From 09b750483a2cde7ea3c80a0238f3224a2cf1cb70 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 3 Jan 2019 22:59:49 +0200 Subject: SL-10293 Firestorm PR: preferences and menu search --- indra/llui/llcheckboxctrl.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/llui/llcheckboxctrl.h') diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 71bdc32e66..07ae9c3b18 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -47,6 +47,7 @@ class LLViewBorder; class LLCheckBoxCtrl : public LLUICtrl +, public ll::ui::SearchableControl { public: struct Params @@ -108,6 +109,18 @@ public: virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control. virtual void resetDirty(); // Clear dirty state +protected: + virtual std::string _getSearchText() const + { + return getLabel() + getToolTip(); + } + + virtual void onSetHighlight() const // When highlight, really do highlight the label + { + if( mLabel ) + mLabel->ll::ui::SearchableControl::setHighlighted( ll::ui::SearchableControl::getHighlighted() ); + } + protected: // note: value is stored in toggle state of button LLButton* mButton; -- cgit v1.2.3