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

unused code removed

Browse Source
This commit is contained in:
Uwe Rathmann 2018-06-11 09:01:37 +02:00
parent 84f196dcc4
commit 0e53dc63ea
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/inputpanel/QskInputContext.cpp
View File

@ -401,16 +401,11 @@ void QskInputContext::setActive( bool on )
bool QskInputContext::isActive() const bool QskInputContext::isActive() const
{ {
if ( m_data->inputEngine ) const QQuickWindow* window = m_data->inputWindow;
{ if ( window == nullptr && m_data->inputPopup )
if ( auto panel = m_data->inputEngine->panel( false ) ) window = m_data->inputPopup->window();
{
return panel->isVisible()
&& panel->window() && panel->window()->isVisible();
}
}
return false; return window && window->isVisible();
} }
QLocale QskInputContext::locale() const QLocale QskInputContext::locale() const

8
src/inputpanel/QskInputEngine.cpp
View File

@ -358,14 +358,6 @@ Qt::Alignment QskInputEngine::panelAlignment() const
return inputProxy() ? Qt::AlignVCenter : Qt::AlignBottom; 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 ) void QskInputEngine::updateLocale( const QLocale& locale )
{ {
if ( !m_data->hasPredictorLocale || locale != m_data->predictorLocale ) if ( !m_data->hasPredictorLocale || locale != m_data->predictorLocale )

2
src/inputpanel/QskInputEngine.h
View File

@ -34,8 +34,6 @@ public:
virtual QQuickItem* inputProxy() const; virtual QQuickItem* inputProxy() const;
virtual QQuickItem* inputItem() const; virtual QQuickItem* inputItem() const;
QLocale locale() const;
public Q_SLOTS: public Q_SLOTS:
void commitKey( int keyCode ); void commitKey( int keyCode );
void commitPredictiveText( int index ); void commitPredictiveText( int index );