AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression, make sure hit testing work on windows again.

Browse Source 
The previous code did not make much sense

This regressed due to 74c9f9d83f

Change-Id: Ia4374623257863edca706a1c3d8b565d0c6bd4c1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Jan-Arve Saether 2011-12-22 11:21:47 +01:00 committed by Qt by Nokia
parent ae8c61db21
commit a203debb0b
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/platforms/windows/qwindowsaccessibility.cpp
View File

@ -746,9 +746,28 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::Invoke(long dispIdMember, const _G
/*
IAccessible
IAccessible::accHitTest documents the value returned in pvarID like this:
| *Point location* | *vt member* | *Value member* |
+========================================================+=============+=========================+
| Outside of the object's boundaries, and either inside | VT_EMPTY | None. |
| or outside of the object's bounding rectangle. | | |
+--------------------------------------------------------+-------------+-------------------------+
| Within the object but not within a child element or a | VT_I4 | lVal is CHILDID_SELF |
| child object. | | |
+--------------------------------------------------------+-------------+-------------------------+
| Within a child element. | VT_I4 | lVal contains |
| | | the child ID. |
+--------------------------------------------------------+-------------+-------------------------+
| Within a child object. | VT_DISPATCH | pdispVal is set to the |
| | | child object's IDispatch|
| | | interface pointer |
+--------------------------------------------------------+-------------+-------------------------+
*/
HRESULT STDMETHODCALLTYPE QWindowsAccessible::accHitTest(long xLeft, long yTop, VARIANT *pvarID)
{
showDebug(__FUNCTION__, accessible);
if (!accessible->isValid())
return E_FAIL;
@ -757,29 +776,22 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::accHitTest(long xLeft, long yTop,
if (child == 0) {
// no child found, return this item if it contains the coordinates
if (accessible->rect().contains(xLeft, yTop)) {
IDispatch *iface = 0;
QueryInterface(IID_IDispatch, (void**)&iface);
if (iface) {
(*pvarID).vt = VT_DISPATCH;
(*pvarID).pdispVal = iface;
return S_OK;
}
(*pvarID).vt = VT_I4;
(*pvarID).lVal = CHILDID_SELF;
return S_OK;
}
(*pvarID).vt = VT_EMPTY;
return S_FALSE;
}
QWindowsAccessible* wacc = new QWindowsAccessible(child);
IDispatch *iface = 0;
wacc->QueryInterface(IID_IDispatch, (void**)&iface);
if (iface) {
(*pvarID).vt = VT_DISPATCH;
(*pvarID).pdispVal = iface;
return S_OK;
} else {
delete wacc;
QWindowsAccessible* wacc = new QWindowsAccessible(child);
IDispatch *iface = 0;
wacc->QueryInterface(IID_IDispatch, (void**)&iface);
if (iface) {
(*pvarID).vt = VT_DISPATCH;
(*pvarID).pdispVal = iface;
return S_OK;
}
}
// Did not find anything
(*pvarID).vt = VT_EMPTY;
return S_FALSE;
}