perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve focusFirstChild() and focusLastChild()

This commit is contained in:
Markus Gans 2015-07-13 00:15:57 +02:00
parent 058c129742
commit 4d67fc73bf
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fwidget.cpp
View File

@ -1280,16 +1280,15 @@ bool FWidget::focusFirstChild (void)
FWidget* widget = static_cast<FWidget*>(*iter); FWidget* widget = static_cast<FWidget*>(*iter);
if ( widget->isEnabled() && widget->acceptFocus() ) if ( widget->isEnabled() && widget->acceptFocus() )
{ {
widget->setFocus();
if ( widget->numOfChildren() >= 1 ) if ( widget->numOfChildren() >= 1 )
{ {
if ( ! widget->focusFirstChild() ) if ( ! widget->focusFirstChild() && widget->isWindow() )
{ {
++iter; ++iter;
continue; continue;
} }
} }
else
widget->setFocus();
return true; return true;
} }
// prefix increment (++) is faster // prefix increment (++) is faster
@ -1318,13 +1317,12 @@ bool FWidget::focusLastChild (void)
FWidget* widget = static_cast<FWidget*>(*iter); FWidget* widget = static_cast<FWidget*>(*iter);
if ( widget->isEnabled() && widget->acceptFocus() ) if ( widget->isEnabled() && widget->acceptFocus() )
{ {
widget->setFocus();
if ( widget->numOfChildren() >= 1 ) if ( widget->numOfChildren() >= 1 )
{ {
if ( ! widget->focusLastChild() ) if ( ! widget->focusLastChild() && widget->isWindow() )
continue; continue;
} }
else
widget->setFocus();
return true; return true;
} }
} }