From 2abde34210f42b75092758849f0703a86202cd61 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 13 Feb 2019 10:24:59 +0100 Subject: [PATCH] hide focus indicator, when there is no activeFocusItem --- src/controls/QskFocusIndicator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index 7c3a5fa5..5c0b5383 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -73,7 +73,8 @@ void QskFocusIndicator::onFocusItemChanged() if ( window() == nullptr ) return; - const QQuickItem* focusItem = window()->activeFocusItem(); + const auto focusItem = window()->activeFocusItem(); + if ( ( focusItem == nullptr ) || ( focusItem == window()->contentItem() ) ) { /* @@ -83,10 +84,9 @@ void QskFocusIndicator::onFocusItemChanged() */ if ( parentItem() != window()->contentItem() ) - { setParentItem( window()->contentItem() ); - updateFocusFrame(); - } + + updateFocusFrame(); return; } @@ -143,7 +143,7 @@ QRectF QskFocusIndicator::focusRect() const { if ( window() && parentItem() ) { - const QQuickItem* item = window()->activeFocusItem(); + const auto item = window()->activeFocusItem(); if ( item && ( item != this ) && item->isVisible() && ( item != window()->contentItem() ) )