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

Fixed bin destruction issues in the GTK+ uiTab.

This commit is contained in:
Pietro Gagliardi 2015-04-29 01:26:52 -04:00
parent 2637bf4e1f
commit 9701daa95c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
new/test/main.c
View File

@ -44,9 +44,9 @@ int main(int argc, char *argv[])
uiWindowOnClosing(w, onClosing, NULL); uiWindowOnClosing(w, onClosing, NULL);
tab = newTab(); tab = newTab();
uiTabAppendPage(tab, "Page 1", newVerticalBox()); uiTabAppendPage(tab, "Page 1", uiControl(newVerticalBox()));
uiTabAppendPage(tab, "Page 2", newHorizontalBox()); uiTabAppendPage(tab, "Page 2", uiControl(newVerticalBox()));
uiTabAppendPage(tab, "Page 3", newVerticalBox()); uiTabAppendPage(tab, "Page 3", uiControl(newVerticalBox()));
uiTabDeletePage(tab, 1); uiTabDeletePage(tab, 1);
// TODO delete the stack // TODO delete the stack
uiWindowSetChild(w, uiControl(tab)); uiWindowSetChild(w, uiControl(tab));

7
new/unix/tab.c
View File

@ -23,9 +23,10 @@ static void onDestroy(void *data)
// first hide ourselves to avoid flicker // first hide ourselves to avoid flicker
gtk_widget_hide(t->widget); gtk_widget_hide(t->widget);
// the pages do not have a libui parent, so we can simply destroy them // the pages do not have a libui parent, so we can simply destroy them
// TODO verify if this is sufficient // we need to remove them from the tab first; see below
for (i = 0; i < t->pages->len; i++) { for (i = 0; i < t->pages->len; i++) {
p = &g_array_index(t->pages, struct tabPage, i); p = &g_array_index(t->pages, struct tabPage, i);
gtk_container_remove(t->container, p->binWidget);
uiControlDestroy(uiControl(p->bin)); uiControlDestroy(uiControl(p->bin));
} }
// then free ourselves // then free ourselves
@ -63,7 +64,9 @@ static void tabDeletePage(uiTab *tt, uintmax_t n)
// now destroy the page // now destroy the page
// this will also remove the tab // this will also remove the tab
// why? simple: both gtk_notebook_remove_tab() and gtk_widget_destroy() call gtk_container_remove() // why? simple: both gtk_notebook_remove_tab() and gtk_widget_destroy() call gtk_container_remove()
// TODO verify this // we need to remove them from the tab first, though, otherwise they won't really be destroyed properly
// (the GtkNotebook will still have the tab in it because its reference ISN'T destroyed, and we crash resizing a bin that no longer exists
gtk_container_remove(t->container, p->binWidget);
uiControlDestroy(uiControl(p->bin)); uiControlDestroy(uiControl(p->bin));
g_array_remove_index(t->pages, n); g_array_remove_index(t->pages, n);