interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented most of Table accLocation(). More TODOs.

This commit is contained in:
Pietro Gagliardi 2015-02-15 03:48:14 -05:00
parent d14b56e1cb
commit 37c7ac364a
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
wintable/accessibility.h
View File

@ -6,6 +6,7 @@
// uncomment this to debug table linked list management // uncomment this to debug table linked list management
#define TABLE_DEBUG_LINKEDLIST #define TABLE_DEBUG_LINKEDLIST
// TODO get rid of this
typedef struct tableAccWhat tableAccWhat; typedef struct tableAccWhat tableAccWhat;
struct tableAccWhat { struct tableAccWhat {
@ -333,11 +334,44 @@ static HRESULT STDMETHODCALLTYPE tableAccaccSelect(IAccessible *this, long flags
static HRESULT STDMETHODCALLTYPE tableAccaccLocation(IAccessible *this, long *pxLeft, long *pyTop, long *pcxWidth, long *pcyHeight, VARIANT varChild) static HRESULT STDMETHODCALLTYPE tableAccaccLocation(IAccessible *this, long *pxLeft, long *pyTop, long *pcxWidth, long *pcyHeight, VARIANT varChild)
{ {
if (TA->t == NULL || TA->std == NULL) { HRESULT hr;
// TODO set values on error tableAccWhat what;
RECT r;
POINT pt;
struct rowcol rc;
if (pxLeft == NULL || pyTop == NULL || pcxWidth == NULL || pcyHeight == NULL)
return E_POINTER;
// TODO set the out parameters to zero?
if (TA->t == NULL || TA->std == NULL)
return RPC_E_DISCONNECTED; return RPC_E_DISCONNECTED;
} what = TA->what;
hr = normalizeWhat(TA, varChild, &what);
if (hr != S_OK)
return hr;
switch (what.role) {
case ROLE_SYSTEM_TABLE:
return IAccessible_accLocation(TA->std, pxLeft, pyTop, pcxWidth, pcyHeight, varChild); return IAccessible_accLocation(TA->std, pxLeft, pyTop, pcxWidth, pcyHeight, varChild);
case ROLE_SYSTEM_ROW:
// TODO see below about width of a row
return E_FAIL;
case ROLE_SYSTEM_CELL:
rc.row = what.row;
rc.column = what.column;
if (!rowColumnToClientRect(TA->t, rc, &r)) {
// TODO what do we do here?
}
break;
}
pt.x = r.left;
pt.y = r.top;
if (ClientToScreen(TA->t->hwnd, &pt) == 0)
return GetLastError(); // TODO
*pxLeft = pt.x;
*pyTop = pt.y;
*pcxWidth = r.right - r.left;
*pcyHeight = r.bottom - r.top;
return S_OK;
} }
static HRESULT STDMETHODCALLTYPE tableAccaccNavigate(IAccessible *this, long navDir, VARIANT varStart, VARIANT *pvarEndUpAt) static HRESULT STDMETHODCALLTYPE tableAccaccNavigate(IAccessible *this, long navDir, VARIANT varStart, VARIANT *pvarEndUpAt)
@ -357,6 +391,7 @@ static HRESULT STDMETHODCALLTYPE tableAccaccHitTest(IAccessible *this, long xLef
if (pvarChild == NULL) if (pvarChild == NULL)
return E_POINTER; return E_POINTER;
// TODO set pvarChild to an invalid value?
if (TA->t == NULL || TA->std == NULL) if (TA->t == NULL || TA->std == NULL)
return RPC_E_DISCONNECTED; return RPC_E_DISCONNECTED;