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

using Qt::PopupFocusReason as reason, when ... yes the focus changes

Browse Source 
because of a QskPopup
This commit is contained in:
Uwe Rathmann 2017-11-02 17:42:19 +01:00
parent 356a4a38c2
commit b1a137100a
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/controls/QskPopup.cpp
View File

@ -11,6 +11,7 @@
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
#include <private/qquickwindow_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
QSK_SUBCONTROL( QskPopup, Overlay ) QSK_SUBCONTROL( QskPopup, Overlay )
@ -24,9 +25,38 @@ static inline QQuickItem* qskNearestFocusScope( const QQuickItem* item )
return scope; return scope;
} }
/*
As the default setting of the root item is to be a focus scope
we usually never get here - beside the flag has been explicitely
disabled in application code.
*/
return nullptr; return nullptr;
} }
static void qskSetFocus( QQuickItem* item, bool on )
{
if ( item->window() == nullptr )
return;
/*
For unknown reasons Qt::PopupFocusReason is blocked inside of
QQuickItem::setFocus. So let's bypass it calling
QQuickWindowPrivate::setFocusInScope/clearFocusInScope directly,
*/
const auto scope = qskNearestFocusScope( item );
if ( scope )
{
auto dw = QQuickWindowPrivate::get( item->window() );
if ( on )
dw->setFocusInScope( scope, item, Qt::PopupFocusReason );
else
dw->clearFocusInScope( scope, item, Qt::PopupFocusReason );
}
}
namespace namespace
{ {
class InputGrabber final : public QQuickItem class InputGrabber final : public QQuickItem
@ -265,22 +295,12 @@ void QskPopup::grabFocus( bool on )
if ( on == hasFocus() ) if ( on == hasFocus() )
return; return;
/*
For unknown reasons Qt::PopupFocusReason is blocked inside of
QQuickItem::setFocus. Nontheless there is specific code dealing
with it f.e in qquicktextinput.cpp. If this becomes a problem
we will have to bypass QQuickItem::setFocus by calling
QQuickWindowPrivate::setFocusInScope/clearFocusInScope directly,
but for the moment we use Qt::OtherFocusReason instead. TODO ...
*/
const auto reason = Qt::OtherFocusReason;
if ( on ) if ( on )
{ {
if ( auto scope = qskNearestFocusScope( this ) ) if ( auto scope = qskNearestFocusScope( this ) )
{ {
m_data->initialFocusItem = scope->scopedFocusItem(); m_data->initialFocusItem = scope->scopedFocusItem();
setFocus( true, reason ); qskSetFocus( this, true );
} }
} }
else else
@ -292,9 +312,9 @@ void QskPopup::grabFocus( bool on )
focusItem = nextItemInFocusChain( false ); focusItem = nextItemInFocusChain( false );
if ( focusItem ) if ( focusItem )
focusItem->setFocus( true, reason ); qskSetFocus( focusItem, true );
else else
setFocus( false, reason ); qskSetFocus( this, false );
} }
} }