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

Fixed bin destruction handling on the Windows backend.

This commit is contained in:
Pietro Gagliardi 2015-05-06 00:52:24 -04:00
parent bc2e6d134b
commit 526e9b81ea
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uipriv.h
View File

@ -22,7 +22,7 @@ struct ptrArray {
uintmax_t cap; uintmax_t cap;
}; };
struct ptrArray *newPtrArray(void); struct ptrArray *newPtrArray(void);
void ptrArrayDestroy(sstruct ptrArray *); void ptrArrayDestroy(struct ptrArray *);
void ptrArrayAppend(struct ptrArray *, void *); void ptrArrayAppend(struct ptrArray *, void *);
void ptrArrayInsertBefore(struct ptrArray *, uintmax_t, void *); void ptrArrayInsertBefore(struct ptrArray *, uintmax_t, void *);
void ptrArrayDelete(struct ptrArray *, uintmax_t); void ptrArrayDelete(struct ptrArray *, uintmax_t);

4
windows/bin.c
View File

@ -18,7 +18,7 @@ static void binDestroy(uiControl *c)
// ensure clean removal by making sure the bin has no OS parent // ensure clean removal by making sure the bin has no OS parent
hwnd = (HWND) uiControlHandle(uiControl(b)); hwnd = (HWND) uiControlHandle(uiControl(b));
if (GetAncestor(hwnd, GA_PARENT) != NULL) if (GetAncestor(hwnd, GA_PARENT) != initialParent)
complain("attempt to destroy bin %p while it has an OS parent", b); complain("attempt to destroy bin %p while it has an OS parent", b);
// don't chain up to base here; we need to destroy children ourselves first // don't chain up to base here; we need to destroy children ourselves first
if (b->mainControl != NULL) { if (b->mainControl != NULL) {
@ -119,6 +119,8 @@ void binSetParent(uiContainer *c, uintptr_t osParent)
HWND newParent = (HWND) osParent; HWND newParent = (HWND) osParent;
hwnd = (HWND) uiControlHandle(uiControl(b)); hwnd = (HWND) uiControlHandle(uiControl(b));
if (newParent == NULL)
newParent = initialParent;
if (SetParent(hwnd, newParent) == 0) if (SetParent(hwnd, newParent) == 0)
logLastError("error changing bin's parent in binSetParent()"); logLastError("error changing bin's parent in binSetParent()");
} }

6
windows/tab.c
View File

@ -54,8 +54,11 @@ static void onDestroy(void *data)
ShowWindow(t->hwnd, SW_HIDE); ShowWindow(t->hwnd, SW_HIDE);
// because the pages don't have by a libui paent, we can simply destroy them // because the pages don't have by a libui paent, we can simply destroy them
// we don't have to worry about the Windows tab control holding a reference to our bin; there is no reference holding anyway // we don't have to worry about the Windows tab control holding a reference to our bin; there is no reference holding anyway
for (i = 0; i < t->len; i++) for (i = 0; i < t->len; i++) {
// we do have to remove the page from the tab control, though
binSetParent(t->pages[i], 0);
uiControlDestroy(uiControl(t->pages[i])); uiControlDestroy(uiControl(t->pages[i]));
}
// and finally destroy ourselves // and finally destroy ourselves
uiFree(t->pages); uiFree(t->pages);
uiFree(t->margined); uiFree(t->margined);
@ -243,6 +246,7 @@ static void tabDeletePage(uiTab *tt, uintmax_t n)
binSetMainControl(page, NULL); binSetMainControl(page, NULL);
// see tabDestroy() above for details // see tabDestroy() above for details
binSetParent(page, 0);
uiControlDestroy(uiControl(page)); uiControlDestroy(uiControl(page));
} }

3
windows/window.c
View File

@ -84,7 +84,8 @@ static void windowDestroy(uiControl *c)
// first hide ourselves // first hide ourselves
ShowWindow(w->hwnd, SW_HIDE); ShowWindow(w->hwnd, SW_HIDE);
// now destroy the bin // now destroy the bin
// the bin has no parent, so we can just call uiControlDestroy() // we need to remove the OS parent first
binSetParent(w->bin, 0);
uiControlDestroy(uiControl(w->bin)); uiControlDestroy(uiControl(w->bin));
// now free the menubar, if any // now free the menubar, if any
if (w->menubar != NULL) if (w->menubar != NULL)