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

Added a prev parameter to finishSelect() on the new Windows Table. This will allow proper scrolling to the selection.

This commit is contained in:
Pietro Gagliardi 2014-11-17 22:52:15 -05:00
parent d893ba6c03
commit 46056e54e4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wintable/main.c
View File

@ -333,7 +333,7 @@ static void recomputeHScroll(struct table *t)
SetScrollInfo(t->hwnd, SB_HORZ, &si, TRUE); SetScrollInfo(t->hwnd, SB_HORZ, &si, TRUE);
} }
static void finishSelect(struct table *t) static void finishSelect(struct table *t, intptr_t prev)
{ {
if (t->selected < 0) if (t->selected < 0)
t->selected = 0; t->selected = 0;
@ -346,9 +346,12 @@ static void finishSelect(struct table *t)
static void keySelect(struct table *t, WPARAM wParam, LPARAM lParam) static void keySelect(struct table *t, WPARAM wParam, LPARAM lParam)
{ {
intptr_t prev;
// TODO figure out correct behavior with nothing selected // TODO figure out correct behavior with nothing selected
if (t->count == 0) // don't try to do anything if there's nothing to do if (t->count == 0) // don't try to do anything if there's nothing to do
return; return;
prev = t->selected;
switch (wParam) { switch (wParam) {
case VK_UP: case VK_UP:
t->selected--; t->selected--;
@ -389,14 +392,16 @@ static void keySelect(struct table *t, WPARAM wParam, LPARAM lParam)
// don't touch anything // don't touch anything
return; return;
} }
finishSelect(t); finishSelect(t, prev);
} }
static void selectItem(struct table *t, WPARAM wParam, LPARAM lParam) static void selectItem(struct table *t, WPARAM wParam, LPARAM lParam)
{ {
int x, y; int x, y;
LONG h; LONG h;
intptr_t prev;
prev = t->selected;
x = GET_X_LPARAM(lParam); x = GET_X_LPARAM(lParam);
y = GET_Y_LPARAM(lParam); y = GET_Y_LPARAM(lParam);
h = rowHeight(t); h = rowHeight(t);
@ -407,7 +412,7 @@ static void selectItem(struct table *t, WPARAM wParam, LPARAM lParam)
if (t->selected >= t->count) if (t->selected >= t->count)
t->selected = -1; t->selected = -1;
t->focusedColumn = hitTestColumn(t, x); t->focusedColumn = hitTestColumn(t, x);
finishSelect(t); finishSelect(t, prev);
} }
static void vscrollto(struct table *t, intptr_t newpos) static void vscrollto(struct table *t, intptr_t newpos)