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

remove keyboardRect() (#57)

This commit is contained in:
Peter Hartmann 2018-03-28 10:05:20 -07:00 committed by uwerat
parent b497b776ae
commit 66677067d5
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
inputcontext/QskInputContext.cpp
View File

@ -139,7 +139,7 @@ QRectF QskInputContext::keyboardRect() const
if ( m_inputPanel if ( m_inputPanel
&& QskDialog::instance()->policy() != QskDialog::TopLevelWindow ) && QskDialog::instance()->policy() != QskDialog::TopLevelWindow )
{ {
return m_inputPanel->keyboardRect(); return m_inputPanel->geometry();
} }
return Inherited::keyboardRect(); return Inherited::keyboardRect();
@ -290,12 +290,12 @@ void QskInputContext::setInputPanel( QskVirtualKeyboard* inputPanel )
if ( m_inputPanel ) if ( m_inputPanel )
{ {
QObject::disconnect( m_inputPanel.data(), &QskVirtualKeyboard::visibleChanged, QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::visibleChanged,
this, &QskInputContext::emitInputPanelVisibleChanged ); this, &QPlatformInputContext::emitInputPanelVisibleChanged );
QObject::disconnect( m_inputPanel.data(), &QskVirtualKeyboard::keyboardRectChanged, QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::keyboardRectChanged,
this, &QskInputContext::emitKeyboardRectChanged ); this, &QPlatformInputContext::emitKeyboardRectChanged );
QObject::disconnect( m_inputPanel.data(), &QskVirtualKeyboard::localeChanged, QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::localeChanged,
this, &QskInputContext::emitLocaleChanged ); this, &QPlatformInputContext::emitLocaleChanged );
if ( m_inputCompositionModel ) if ( m_inputCompositionModel )
m_inputPanel->disconnect( m_inputCompositionModel.get() ); m_inputPanel->disconnect( m_inputCompositionModel.get() );
} }
@ -304,12 +304,12 @@ void QskInputContext::setInputPanel( QskVirtualKeyboard* inputPanel )
if ( !m_inputPanel ) if ( !m_inputPanel )
return; return;
QObject::connect( m_inputPanel.data(), &QskVirtualKeyboard::visibleChanged, QObject::connect( m_inputPanel, &QskVirtualKeyboard::visibleChanged,
this, &QskInputContext::emitInputPanelVisibleChanged ); this, &QPlatformInputContext::emitInputPanelVisibleChanged );
QObject::connect( m_inputPanel.data(), &QskVirtualKeyboard::keyboardRectChanged, QObject::connect( m_inputPanel, &QskVirtualKeyboard::keyboardRectChanged,
this, &QskInputContext::emitKeyboardRectChanged ); this, &QPlatformInputContext::emitKeyboardRectChanged );
QObject::connect( m_inputPanel.data(), &QskVirtualKeyboard::localeChanged, QObject::connect( m_inputPanel, &QskVirtualKeyboard::localeChanged,
this, &QskInputContext::emitLocaleChanged ); this, &QPlatformInputContext::emitLocaleChanged );
if ( m_inputCompositionModel ) if ( m_inputCompositionModel )
{ {
QObject::connect( QObject::connect(

2
src/controls/QskVirtualKeyboard.h
View File

@ -101,8 +101,6 @@ public:
QString textForKey( int ) const; QString textForKey( int ) const;
QString displayLanguageName() const; QString displayLanguageName() const;
QRectF keyboardRect() const;
// takes ownership: // takes ownership:
void registerCompositionModelForLocale( const QLocale& locale, void registerCompositionModelForLocale( const QLocale& locale,
QskInputCompositionModel* model ); QskInputCompositionModel* model );