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

First draft of integrating holders into uiWindow. Increasing urge to just ditch the cross-platform uiBox and have the GTK+ uiBox be a thin GtkBox wrapper (in which case we don't even need containerWidget!).

This commit is contained in:
Pietro Gagliardi 2015-06-29 11:48:27 -04:00
parent 2af0ffb3c6
commit e22439c0a2
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
redo/unix/window.c
View File

@ -16,7 +16,9 @@ struct window {
GtkWidget *menubar; GtkWidget *menubar;
uiControl *holder;
uiControl *child; uiControl *child;
int (*onClosing)(uiWindow *, void *); int (*onClosing)(uiWindow *, void *);
void *onClosingData; void *onClosingData;
int margined; int margined;
@ -47,10 +49,11 @@ static void windowCommitDestroy(uiControl *c)
// first hide ourselves // first hide ourselves
gtk_widget_hide(w->widget); gtk_widget_hide(w->widget);
// now destroy the bin // now destroy the child; removing it from its holder first
// we need to remove the bin from its parent first holderSetChild(w->holder, NULL);
//TODO uiBinRemoveOSParent(w->bin); uiControlDestroy(w->child);
//TODO uiControlDestroy(uiControl(w->bin)); // now destroy the holder
uiControlDestroy(w->holder);
// now destroy the menus, if any // now destroy the menus, if any
if (w->menubar != NULL) if (w->menubar != NULL)
freeMenubar(w->menubar); freeMenubar(w->menubar);
@ -112,10 +115,10 @@ static void windowSetChild(uiWindow *ww, uiControl *child)
struct window *w = (struct window *) ww; struct window *w = (struct window *) ww;
if (w->child != NULL) if (w->child != NULL)
uiControlSetParent(w->child, NULL); holderSetChild(w->holder, NULL);
w->child = child; w->child = child;
if (w->child != NULL) { if (w->child != NULL) {
//TODO uiControlSetParent(w->child, uiControl(w)); holderSetChild(w->holder, w->child);
uiControlQueueResize(w->child); uiControlQueueResize(w->child);
} }
} }
@ -147,6 +150,7 @@ static void windowResizeChild(uiWindow *ww)
uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
{ {
struct window *w; struct window *w;
GtkWidget *holderWidget;
w = (struct window *) uiNewControl(uiTypeWindow()); w = (struct window *) uiNewControl(uiTypeWindow());
@ -171,14 +175,14 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
gtk_container_add(w->vboxContainer, w->menubar); gtk_container_add(w->vboxContainer, w->menubar);
} }
/*TODO w->bin = newBin(); w->holder = newHolder();
binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin))); holderWidget = GTK_WIDGET(uiControlHandle(uiControl(w->holder)));
gtk_widget_set_hexpand(binWidget, TRUE); gtk_widget_set_hexpand(holderWidget, TRUE);
gtk_widget_set_halign(binWidget, GTK_ALIGN_FILL); gtk_widget_set_halign(holderWidget, GTK_ALIGN_FILL);
gtk_widget_set_vexpand(binWidget, TRUE); gtk_widget_set_vexpand(holderWidget, TRUE);
gtk_widget_set_valign(binWidget, GTK_ALIGN_FILL); gtk_widget_set_valign(holderWidget, GTK_ALIGN_FILL);
uiBinSetOSParent(w->bin, (uintptr_t) (w->vboxContainer)); gtk_container_add(w->vboxContainer, holderWidget);
*/
// show everything in the vbox, but not the GtkWindow itself // show everything in the vbox, but not the GtkWindow itself
gtk_widget_show_all(w->vboxWidget); gtk_widget_show_all(w->vboxWidget);