diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index 7a903b47..93e2b49f 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -401,16 +401,11 @@ void QskInputContext::setActive( bool on ) bool QskInputContext::isActive() const { - if ( m_data->inputEngine ) - { - if ( auto panel = m_data->inputEngine->panel( false ) ) - { - return panel->isVisible() - && panel->window() && panel->window()->isVisible(); - } - } + const QQuickWindow* window = m_data->inputWindow; + if ( window == nullptr && m_data->inputPopup ) + window = m_data->inputPopup->window(); - return false; + return window && window->isVisible(); } QLocale QskInputContext::locale() const diff --git a/src/inputpanel/QskInputEngine.cpp b/src/inputpanel/QskInputEngine.cpp index 0f03eca4..c7d32c40 100644 --- a/src/inputpanel/QskInputEngine.cpp +++ b/src/inputpanel/QskInputEngine.cpp @@ -358,14 +358,6 @@ Qt::Alignment QskInputEngine::panelAlignment() const return inputProxy() ? Qt::AlignVCenter : Qt::AlignBottom; } -QLocale QskInputEngine::locale() const -{ - if ( m_data->panel ) - return m_data->panel->locale(); - - return QLocale(); -} - void QskInputEngine::updateLocale( const QLocale& locale ) { if ( !m_data->hasPredictorLocale || locale != m_data->predictorLocale ) diff --git a/src/inputpanel/QskInputEngine.h b/src/inputpanel/QskInputEngine.h index 5e3898ed..30854703 100644 --- a/src/inputpanel/QskInputEngine.h +++ b/src/inputpanel/QskInputEngine.h @@ -34,8 +34,6 @@ public: virtual QQuickItem* inputProxy() const; virtual QQuickItem* inputItem() const; - QLocale locale() const; - public Q_SLOTS: void commitKey( int keyCode ); void commitPredictiveText( int index );