interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented correct z-ordering for radiobuttons.

This commit is contained in:
Pietro Gagliardi 2015-06-04 23:31:43 -04:00
parent bd194660c0
commit d056c07ba9
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
redo/windows/radiobuttons.c
View File

@ -5,6 +5,7 @@ struct radiobuttons {
uiRadioButtons r; uiRadioButtons r;
struct ptrArray *hwnds; struct ptrArray *hwnds;
uiControl *parent; uiControl *parent;
uintptr_t insertAfter; // safe to be 0 initially (either not in a container or trully the first in the z-order)
}; };
// TODO properly test parent changes (add an Add Item button to the test program) // TODO properly test parent changes (add an Add Item button to the test program)
@ -128,14 +129,24 @@ COMMIT(Disable, uiWindowsUtilDisable)
static uintptr_t radiobuttonsStartZOrder(uiControl *c) static uintptr_t radiobuttonsStartZOrder(uiControl *c)
{ {
// TODO struct radiobuttons *r = (struct radiobuttons *) c;
return 0;
return r->insertAfter;
} }
static uintptr_t radiobuttonsSetZOrder(uiControl *c, uintptr_t insertAfter) static uintptr_t radiobuttonsSetZOrder(uiControl *c, uintptr_t insertAfter)
{ {
// TODO struct radiobuttons *r = (struct radiobuttons *) c;
return 0; uintmax_t i;
HWND hwnd;
r->insertAfter = insertAfter;
for (i = 0; i < r->hwnds->len; i++) {
hwnd = ptrArrayIndex(r->hwnds, HWND, i);
uiWindowsUtilSetZOrder(hwnd, insertAfter);
insertAfter = (uintptr_t) hwnd;
}
return insertAfter;
} }
static int radiobuttonsHasTabStops(uiControl *c) static int radiobuttonsHasTabStops(uiControl *c)
@ -150,6 +161,7 @@ static void radiobuttonsAppend(uiRadioButtons *rr, const char *text)
struct radiobuttons *r = (struct radiobuttons *) rr; struct radiobuttons *r = (struct radiobuttons *) rr;
HWND hwnd; HWND hwnd;
WCHAR *wtext; WCHAR *wtext;
HWND after;
wtext = toUTF16(text); wtext = toUTF16(text);
hwnd = uiWindowsUtilCreateControlHWND(0, hwnd = uiWindowsUtilCreateControlHWND(0,
@ -160,6 +172,15 @@ static void radiobuttonsAppend(uiRadioButtons *rr, const char *text)
uiFree(wtext); uiFree(wtext);
uiWindowsUtilSetParent(hwnd, r->parent); uiWindowsUtilSetParent(hwnd, r->parent);
uiWindowsRegisterWM_COMMANDHandler(hwnd, onWM_COMMAND, uiControl(r)); uiWindowsRegisterWM_COMMANDHandler(hwnd, onWM_COMMAND, uiControl(r));
// maintain z-order
if (r->hwnds->len == 0) // first item
uiWindowsUtilSetZOrder(hwnd, r->insertAfter);
else {
after = ptrArrayIndex(r->hwnds, HWND, r->hwnds->len - 1);
uiWindowsUtilSetZOrder(hwnd, (uintptr_t) after);
}
ptrArrayAppend(r->hwnds, hwnd); ptrArrayAppend(r->hwnds, hwnd);
uiControlQueueResize(uiControl(r)); uiControlQueueResize(uiControl(r));
} }