1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt windows input context to QGuiApplication::focusObject()

Browse Source 
Change-Id: I8c18814d705b456d3285d7a5f2e1e0849af99b70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Pekka Vuorela 2012-03-29 16:22:54 +03:00 committed by Qt by Nokia
parent 8129f45e65
commit 1e8f2ae34b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/windows/qwindowsinputcontext.cpp
View File

@ -184,7 +184,7 @@ void QWindowsInputContext::reset()
QPlatformInputContext::reset();
if (!m_compositionContext.hwnd)
return;
QObject *fo = qApp->inputMethod()->inputItem();
QObject *fo = qApp->focusObject();
if (QWindowsContext::verboseInputMethods)
qDebug() << __FUNCTION__<< fo;
if (!fo)
@ -329,11 +329,11 @@ static inline QTextFormat standardFormat(StandardFormat format)
bool QWindowsInputContext::startComposition(HWND hwnd)
{
const QObject *fo = qApp->inputMethod()->inputItem();
const QObject *fo = qApp->focusObject();
if (!fo)
return false;
// This should always match the object.
QWindow *window = qApp->inputMethod()->inputWindow();
QWindow *window = qApp->focusWindow();
if (!window)
return false;
if (QWindowsContext::verboseInputMethods)
@ -397,7 +397,7 @@ static inline QList<QInputMethodEvent::Attribute>
bool QWindowsInputContext::composition(HWND hwnd, LPARAM lParamIn)
{
QObject *fo = qApp->inputMethod()->inputItem();
QObject *fo = qApp->focusObject();
const int lParam = int(lParamIn);
if (QWindowsContext::verboseInputMethods)
qDebug() << '>' << __FUNCTION__ << fo << debugComposition(lParam)
@ -459,7 +459,7 @@ bool QWindowsInputContext::endComposition(HWND hwnd)
// against that.
if (m_endCompositionRecursionGuard || m_compositionContext.hwnd != hwnd)
return false;
QObject *fo = qApp->inputMethod()->inputItem();
QObject *fo = qApp->focusObject();
if (!fo)
return false;
@ -537,7 +537,7 @@ bool QWindowsInputContext::handleIME_Request(WPARAM wParam,
int QWindowsInputContext::reconvertString(RECONVERTSTRING *reconv)
{
QObject *fo = qApp->inputMethod()->inputItem();
QObject *fo = qApp->focusObject();
if (!fo)
return false;