livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-11172 Re-fixed, now should affect 'tab' only

master
Andrey Kleshchev 2020-04-13 15:06:11 +03:00
parent 826d6fc591
commit 80447f5e6b
11 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llaccordionctrl.cpp
View File

@ -657,7 +657,7 @@ void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
}
// virtual
void LLAccordionCtrl::onChildGotFocus(const LLUICtrl *cntrl)
void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
{
if (mScrollbar && mScrollbar->getVisible())
{
@ -683,7 +683,7 @@ void LLAccordionCtrl::onChildGotFocus(const LLUICtrl *cntrl)
}
}
LLUICtrl::onChildGotFocus(cntrl);
LLUICtrl::onUpdateScrollToChild(cntrl);
}
void LLAccordionCtrl::onOpen (const LLSD& key)

2
indra/llui/llaccordionctrl.h
View File

@ -111,7 +111,7 @@ public:
void draw();
void onScrollPosChangeCallback(S32, LLScrollbar*);
virtual void onChildGotFocus(const LLUICtrl * cntrl);
virtual void onUpdateScrollToChild(const LLUICtrl * cntrl);
void onOpen (const LLSD& key);
S32 notifyParent(const LLSD& info);

4
indra/llui/llaccordionctrltab.cpp
View File

@ -453,7 +453,7 @@ void LLAccordionCtrlTab::onVisibilityChange(BOOL new_visibility)
}
// virtual
void LLAccordionCtrlTab::onChildGotFocus(const LLUICtrl *cntrl)
void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
{
if (mScrollbar && mScrollbar->getVisible())
{
@ -478,7 +478,7 @@ void LLAccordionCtrlTab::onChildGotFocus(const LLUICtrl *cntrl)
}
}
LLUICtrl::onChildGotFocus(cntrl);
LLUICtrl::onUpdateScrollToChild(cntrl);
}
BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)

2
indra/llui/llaccordionctrltab.h
View File

@ -159,7 +159,7 @@ public:
* Raises notifyParent event with "child_visibility_change" = new_visibility
*/
void onVisibilityChange(BOOL new_visibility);
virtual void onChildGotFocus(const LLUICtrl * cntrl);
virtual void onUpdateScrollToChild(const LLUICtrl * cntrl);
// Changes expand/collapse state and triggers expand/collapse callbacks
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);

1
indra/llui/lllineeditor.cpp
View File

@ -2142,6 +2142,7 @@ void LLLineEditor::clear()
void LLLineEditor::onTabInto()
{
selectAll();
LLUICtrl::onTabInto();
}
//virtual

1
indra/llui/llmultisliderctrl.cpp
View File

@ -474,6 +474,7 @@ void LLMultiSliderCtrl::onTabInto()
{
mEditor->onTabInto();
}
LLF32UICtrl::onTabInto();
}
void LLMultiSliderCtrl::reportInvalidData()

1
indra/llui/llsliderctrl.cpp
View File

@ -438,6 +438,7 @@ void LLSliderCtrl::onTabInto()
{
mEditor->onTabInto();
}
LLF32UICtrl::onTabInto();
}
void LLSliderCtrl::reportInvalidData()

3
indra/llui/llspinctrl.cpp
View File

@ -442,7 +442,8 @@ void LLSpinCtrl::setAllowEdit(BOOL allow_edit)
void LLSpinCtrl::onTabInto()
{
mEditor->onTabInto();
mEditor->onTabInto();
LLF32UICtrl::onTabInto();
}

4
indra/llui/lluictrl.cpp
View File

@ -679,7 +679,6 @@ void LLUICtrl::setFocus(BOOL b)
if (!hasFocus())
{
gFocusMgr.setKeyboardFocus( this );
onChildGotFocus(this);
}
}
else
@ -722,8 +721,9 @@ void LLUICtrl::resetDirty()
}
// virtual
void LLUICtrl::onTabInto()
void LLUICtrl::onTabInto()
{
onUpdateScrollToChild(this);
}
// virtual

4
indra/llui/llview.cpp
View File

@ -641,12 +641,12 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
}
// virtual
void LLView::onChildGotFocus(const LLUICtrl * cntrl)
void LLView::onUpdateScrollToChild(const LLUICtrl * cntrl)
{
LLView* parent_view = getParent();
if (parent_view)
{
parent_view->onChildGotFocus(cntrl);
parent_view->onUpdateScrollToChild(cntrl);
}
}

2
indra/llui/llview.h
View File

@ -301,7 +301,7 @@ public:
virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
virtual void onVisibilityChange ( BOOL new_visibility );
virtual void onChildGotFocus(const LLUICtrl * cntrl);
virtual void onUpdateScrollToChild(const LLUICtrl * cntrl);
void pushVisible(BOOL visible) { mLastVisible = mVisible; setVisible(visible); }
void popVisible() { setVisible(mLastVisible); }