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

Added debugging checks for doselect() to spot illegal selections. Rewrote some expressions for consistency.

This commit is contained in:
Pietro Gagliardi 2014-12-16 11:47:52 -05:00
parent 152f446ce8
commit 03fce2feab
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wintable/new/select.h
View File

@ -12,10 +12,30 @@ static void doselect(struct table *t, intptr_t row, intptr_t column)
intptr_t xpos; intptr_t xpos;
LONG clientWidth; LONG clientWidth;
// check existing selection to see if it's valid
if (t->selectedRow == -1 && t->selectedColumn != -1)
panic("sanity check failure: old Table selection invalid (row == -1, column != -1");
if (t->selectedRow != -1 && t->selectedColumn == -1)
panic("sanity check failure: old Table selection invalid (row != -1, column == -1");
if (t->selectedRow >= t->count)
panic("sanity check failure: old Table selection invalid (row out of range)");
if (t->selectedColumn >= t->nColumns)
panic("sanity check failure: old Table selection invalid (column out of range");
oldrow = t->selectedRow; oldrow = t->selectedRow;
t->selectedRow = row; t->selectedRow = row;
t->selectedColumn = column; t->selectedColumn = column;
// check new selection to see if it's valid
if (t->selectedRow == -1 && t->selectedColumn != -1)
panic("sanity check failure: new Table selection invalid (row == -1, column != -1");
if (t->selectedRow != -1 && t->selectedColumn == -1)
panic("sanity check failure: new Table selection invalid (row != -1, column == -1");
if (t->selectedRow >= t->count)
panic("sanity check failure: new Table selection invalid (row out of range)");
if (t->selectedColumn >= t->nColumns)
panic("sanity check failure: new Table selection invalid (column out of range");
if (GetClientRect(t->hwnd, &client) == 0) if (GetClientRect(t->hwnd, &client) == 0)
panic("error getting Table client rect in doselect()"); panic("error getting Table client rect in doselect()");
client.top += t->headerHeight; client.top += t->headerHeight;
@ -153,7 +173,7 @@ HANDLER(keyDownSelectHandler)
column = 0; column = 0;
} else { } else {
row++; row++;
if (row > t->count - 1) if (row >= t->count)
row = t->count - 1; row = t->count - 1;
} }
break; break;
@ -170,7 +190,7 @@ HANDLER(keyDownSelectHandler)
column = 0; column = 0;
} else { } else {
column++; column++;
if (column > t->nColumns - 1) if (column >= t->nColumns)
column = t->nColumns - 1; column = t->nColumns - 1;
} }
break; break;
@ -206,7 +226,7 @@ HANDLER(keyDownSelectHandler)
row = t->vscrollpos + t->vpagesize - 1; row = t->vscrollpos + t->vpagesize - 1;
if (row == t->selectedRow) if (row == t->selectedRow)
row += t->vpagesize - 1; row += t->vpagesize - 1;
if (row > t->count - 1) if (row >= t->count)
row = t->count - 1; row = t->count - 1;
} }
break; break;