diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-08-09 15:23:00 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-08-09 15:23:00 +0300 |
| commit | 7bce6580dc2849b99ae6eedd5c373b653ab5186d (patch) | |
| tree | 60a9b8f9d684bc7c4eee9e24a5091b25d230424e /indra | |
| parent | 55c887225f230822f5ffcd1b1a01a87d17653bd7 (diff) | |
EXT-7593 FIXED Added passing focus to the selected outfit tab when My Outfits tab is open.
- Removed "tab_stop" from outfit tabs to prevent passing focus to a tab chosen by default from LLUICtrl::focusFirstItem(). Besides the order of passing focus between outfit tabs by pressing "Tab" was undetermined.
- Had to remove const from the return of LLAccordionCtrl::getSelectedTab() to use the returned pointer for setting focus.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/846/.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llaccordionctrl.h | 2 | ||||
| -rw-r--r-- | indra/newview/lloutfitslist.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/outfit_accordion_tab.xml | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h index f26a380e5f..6fc9ca86a3 100644 --- a/indra/llui/llaccordionctrl.h +++ b/indra/llui/llaccordionctrl.h @@ -139,7 +139,7 @@ public: */ const LLAccordionCtrlTab* getExpandedTab() const; - const LLAccordionCtrlTab* getSelectedTab() const { return mSelectedTab; } + LLAccordionCtrlTab* getSelectedTab() const { return mSelectedTab; } bool getFitParent() const {return mFitParent;} diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index f921bca623..8422b97b3a 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -403,6 +403,12 @@ void LLOutfitsList::onOpen(const LLSD& /*info*/) mIsInitialized = true; } + + LLAccordionCtrlTab* selected_tab = mAccordion->getSelectedTab(); + if (!selected_tab) return; + + // Pass focus to the selected outfit tab. + selected_tab->showAndFocusHeader(); } void LLOutfitsList::refreshList(const LLUUID& category_id) diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 06bd1e9ff4..20ff492c0f 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -9,6 +9,7 @@ layout="topleft" name="Mockup Tab" selection_enabled="true" + tab_stop="false" title="Mockup Tab" translate="false" width="0"> |