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

Implemented parenting on Windows; doing everything through uiControlSetParent() makes this trivial. Now I need to implement sizing, so we can actually test some things with this.

This commit is contained in:
Pietro Gagliardi 2022-07-29 22:28:38 -04:00
parent 7c0113f220
commit c9310e21b7
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
windows/window.cpp
View File

@ -6,9 +6,9 @@
struct windowImplData { struct windowImplData {
HWND hwnd; HWND hwnd;
char *title; char *title;
uiControl *child;
#if 0 #if 0
HMENU menubar; HMENU menubar;
uiControl *child;
BOOL shownOnce; BOOL shownOnce;
int visible; int visible;
int (*onClosing)(uiWindow *, void *); int (*onClosing)(uiWindow *, void *);
@ -143,10 +143,6 @@ static void uiWindowDestroy(uiControl *c)
// first hide ourselves // first hide ourselves
ShowWindow(w->hwnd, SW_HIDE); ShowWindow(w->hwnd, SW_HIDE);
// now destroy the child // now destroy the child
if (w->child != NULL) {
uiControlSetParent(w->child, NULL);
uiControlDestroy(w->child);
}
// now free the menubar, if any // now free the menubar, if any
if (w->menubar != NULL) if (w->menubar != NULL)
freeMenubar(w->menubar); freeMenubar(w->menubar);
@ -361,10 +357,7 @@ void uiWindowSetBorderless(uiWindow *w, int borderless)
void uiWindowSetChild(uiWindow *w, uiControl *child) void uiWindowSetChild(uiWindow *w, uiControl *child)
{ {
if (w->child != NULL) { if (w->child != NULL) {}
uiControlSetParent(w->child, NULL);
uiWindowsControlSetParentHWND(uiWindowsControl(w->child), NULL);
}
w->child = child; w->child = child;
if (w->child != NULL) { if (w->child != NULL) {
uiControlSetParent(w->child, uiControl(w)); uiControlSetParent(w->child, uiControl(w));
@ -511,6 +504,11 @@ static void windowFree(uiControl *c, void *implData)
struct windowImplData *wi = (struct windowImplData *) implData; struct windowImplData *wi = (struct windowImplData *) implData;
HRESULT hr; HRESULT hr;
if (wi->child != NULL) {
uiControlSetParent(wi->child, NULL);
uiControlFree(wi->child);
wi->child = NULL;
}
if (wi->title != NULL) { if (wi->title != NULL) {
uiprivFreeUTF8(wi->title); uiprivFreeUTF8(wi->title);
wi->title = NULL; wi->title = NULL;
@ -610,6 +608,24 @@ void uiprivSysWindowSetTitle(uiWindow *w, const char *title)
// don't queue resize; the caption isn't part of what affects layout and sizing of the client area (it'll be ellipsized if too long) // don't queue resize; the caption isn't part of what affects layout and sizing of the client area (it'll be ellipsized if too long)
} }
uiControl *uiprivSysWindowChild(uiWindow *w)
{
struct windowImplData *wi = (struct windowImplData *) uiControlImplData(uiControl(w));
return wi->child;
}
void uiprivSysWindowSetChild(uiWindow *w, uiControl *child)
{
struct windowImplData *wi = (struct windowImplData *) uiControlImplData(uiControl(w));
if (wi->child != NULL)
uiControlSetParent(wi->child, NULL);
wi->child = child;
if (wi->child != NULL)
uiControlSetParent(wi->child, uiControl(w));
}
#if 0 #if 0
// this cannot queue a resize because it's called by the resize handler // this cannot queue a resize because it's called by the resize handler