peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide focus indicator, when there is no activeFocusItem

Browse Source
This commit is contained in:
Uwe Rathmann 2019-02-13 10:24:59 +01:00
parent 7ee3c9faff
commit 2abde34210
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/controls/QskFocusIndicator.cpp
View File

@ -73,7 +73,8 @@ void QskFocusIndicator::onFocusItemChanged()
if ( window() == nullptr ) if ( window() == nullptr )
return; return;
const QQuickItem* focusItem = window()->activeFocusItem(); const auto focusItem = window()->activeFocusItem();
if ( ( focusItem == nullptr ) || ( focusItem == window()->contentItem() ) ) if ( ( focusItem == nullptr ) || ( focusItem == window()->contentItem() ) )
{ {
/* /*
@ -83,10 +84,9 @@ void QskFocusIndicator::onFocusItemChanged()
*/ */
if ( parentItem() != window()->contentItem() ) if ( parentItem() != window()->contentItem() )
{
setParentItem( window()->contentItem() ); setParentItem( window()->contentItem() );
updateFocusFrame(); updateFocusFrame();
}
return; return;
} }
@ -143,7 +143,7 @@ QRectF QskFocusIndicator::focusRect() const
{ {
if ( window() && parentItem() ) if ( window() && parentItem() )
{ {
const QQuickItem* item = window()->activeFocusItem(); const auto item = window()->activeFocusItem();
if ( item && ( item != this ) && item->isVisible() && if ( item && ( item != this ) && item->isVisible() &&
( item != window()->contentItem() ) ) ( item != window()->contentItem() ) )