interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some more uiParent migration.

This commit is contained in:
Pietro Gagliardi 2015-04-12 20:08:32 -04:00
parent bdb0ffd67a
commit dcf581eb14
7 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
new/control.c
View File

@ -11,7 +11,7 @@ uintptr_t uiControlHandle(uiControl *c)
return (*(c->handle))(c); return (*(c->handle))(c);
} }
void uiControlSetParent(uiControl *c, uintptr_t parent) void uiControlSetParent(uiControl *c, uiParent *parent)
{ {
(*(c->setParent))(c, parent); (*(c->setParent))(c, parent);
} }

4
new/newcontrol_darwin.m
View File

@ -42,10 +42,10 @@ static void singleSetParent(uiControl *c, uintptr_t parent)
static void singleRemoveParent(uiControl *c) static void singleRemoveParent(uiControl *c)
{ {
singleView *s = (singleView *) (c->internal); singleView *s = (singleView *) (c->internal);
uintptr_t oldparent; uiParent *oldparent;
oldparent = s->parent; oldparent = s->parent;
s->parent = 0; s->parent = NULL;
[s->immediate removeFromSuperview]; [s->immediate removeFromSuperview];
updateParent(oldparent); updateParent(oldparent);
} }

4
new/newcontrol_unix.c
View File

@ -40,10 +40,10 @@ static void singleSetParent(uiControl *c, uintptr_t parent)
static void singleRemoveParent(uiControl *c) static void singleRemoveParent(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->internal);
uintptr_t oldparent; uiParent *oldparent;
oldparent = s->parent; oldparent = s->parent;
s->parent = 0; s->parent = NULL;
gtk_container_remove(GTK_CONTAINER(oldparent), s->immediate); gtk_container_remove(GTK_CONTAINER(oldparent), s->immediate);
updateParent(oldparent); updateParent(oldparent);
} }

24
new/newcontrol_windows.c
View File

@ -8,7 +8,7 @@ struct singleHWND {
BOOL (*onWM_COMMAND)(uiControl *, WORD, LRESULT *); BOOL (*onWM_COMMAND)(uiControl *, WORD, LRESULT *);
BOOL (*onWM_NOTIFY)(uiControl *, NMHDR *, LRESULT *); BOOL (*onWM_NOTIFY)(uiControl *, NMHDR *, LRESULT *);
void (*onWM_DESTROY)(uiControl *); void (*onWM_DESTROY)(uiControl *);
uintptr_t parent; uiParent *parent;
BOOL userHid; BOOL userHid;
BOOL containerHid; BOOL containerHid;
BOOL userDisabled; BOOL userDisabled;
@ -31,26 +31,26 @@ static uintptr_t singleHandle(uiControl *c)
return (uintptr_t) (s->hwnd); return (uintptr_t) (s->hwnd);
} }
static void singleSetParent(uiControl *c, uintptr_t parent) static void singleSetParent(uiControl *c, uiParent *parent)
{ {
singleHWND *s = (singleHWND *) (c->internal); singleHWND *s = (singleHWND *) (c->internal);
s->parent = parent; s->parent = parent;
if (SetParent(s->hwnd, (HWND) (s->parent)) == NULL) if (SetParent(s->hwnd, (HWND) (s->parent)) == NULL)
logLastError("error setting control parent in singleSetParent()"); logLastError("error setting control parent in singleSetParent()");
updateParent(s->parent); uiParentUpdate(s->parent);
} }
static void singleRemoveParent(uiControl *c) static void singleRemoveParent(uiControl *c)
{ {
singleHWND *s = (singleHWND *) (c->internal); singleHWND *s = (singleHWND *) (c->internal);
uintptr_t oldparent; uiParent *oldparent;
oldparent = s->parent; oldparent = s->parent;
s->parent = 0; s->parent = NULL;
if (SetParent(s->hwnd, initialParent) == NULL) if (SetParent(s->hwnd, initialParent) == NULL)
logLastError("error removing control parent in singleSetParent()"); logLastError("error removing control parent in singleSetParent()");
updateParent(oldparent); uiParentUpdate(oldparent);
} }
static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
@ -77,7 +77,8 @@ static void singleShow(uiControl *c)
s->userHid = FALSE; s->userHid = FALSE;
if (!s->containerHid) { if (!s->containerHid) {
ShowWindow(s->hwnd, SW_SHOW); ShowWindow(s->hwnd, SW_SHOW);
updateParent(s->parent); if (s->parent != NULL)
uiUpdateParent(s->parent);
} }
} }
@ -87,7 +88,8 @@ static void singleHide(uiControl *c)
s->userHid = TRUE; s->userHid = TRUE;
ShowWindow(s->hwnd, SW_HIDE); ShowWindow(s->hwnd, SW_HIDE);
updateParent(s->parent); if (s->parent != NULL)
uiUpdateParent(s->parent);
} }
static void singleContainerShow(uiControl *c) static void singleContainerShow(uiControl *c)
@ -97,7 +99,8 @@ static void singleContainerShow(uiControl *c)
s->containerHid = FALSE; s->containerHid = FALSE;
if (!s->userHid) { if (!s->userHid) {
ShowWindow(s->hwnd, SW_SHOW); ShowWindow(s->hwnd, SW_SHOW);
updateParent(s->parent); if (s->parent != NULL)
uiUpdateParent(s->parent);
} }
} }
@ -107,7 +110,8 @@ static void singleContainerHide(uiControl *c)
s->containerHid = TRUE; s->containerHid = TRUE;
ShowWindow(s->hwnd, SW_HIDE); ShowWindow(s->hwnd, SW_HIDE);
updateParent(s->parent); if (s->parent != NULL)
uiUpdateParent(s->parent);
} }
static void singleEnable(uiControl *c) static void singleEnable(uiControl *c)

30
new/stack.c
View File

@ -9,7 +9,7 @@ struct stack {
uintmax_t len; uintmax_t len;
uintmax_t cap; uintmax_t cap;
int vertical; int vertical;
uintptr_t parent; uiParent *parent;
int padded; int padded;
int userHid; int userHid;
int containerHid; int containerHid;
@ -41,7 +41,7 @@ static uintptr_t stackHandle(uiControl *c)
return 0; return 0;
} }
static void stackSetParent(uiControl *c, uintptr_t parent) static void stackSetParent(uiControl *c, uiParent *parent)
{ {
stack *s = (stack *) (c->data); stack *s = (stack *) (c->data);
uintmax_t i; uintmax_t i;
@ -49,20 +49,20 @@ static void stackSetParent(uiControl *c, uintptr_t parent)
s->parent = parent; s->parent = parent;
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlSetParent(s->controls[i].c, s->parent); uiControlSetParent(s->controls[i].c, s->parent);
updateParent(s->parent); uiParentUpdate(s->parent);
} }
static void stackRemoveParent(uiControl *c) static void stackRemoveParent(uiControl *c)
{ {
stack *s = (stack *) (c->data); stack *s = (stack *) (c->data);
uintmax_t i; uintmax_t i;
uintptr_t oldparent; uiParent *oldparent;
oldparent = s->parent; oldparent = s->parent;
s->parent = 0; s->parent = NULL;
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlRemoveParent(s->controls[i].c); uiControlRemoveParent(s->controls[i].c);
updateParent(oldparent); uiParentUpdate(oldparent);
} }
static void stackPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height) static void stackPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
@ -224,7 +224,8 @@ static void stackShow(uiControl *c)
if (!s->containerHid) { if (!s->containerHid) {
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlContainerShow(s->controls[i].c); uiControlContainerShow(s->controls[i].c);
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }
} }
@ -236,7 +237,8 @@ static void stackHide(uiControl *c)
s->userHid = 1; s->userHid = 1;
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlContainerHide(s->controls[i].c); uiControlContainerHide(s->controls[i].c);
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }
static void stackContainerShow(uiControl *c) static void stackContainerShow(uiControl *c)
@ -248,7 +250,8 @@ static void stackContainerShow(uiControl *c)
if (!s->userHid) { if (!s->userHid) {
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlContainerShow(s->controls[i].c); uiControlContainerShow(s->controls[i].c);
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }
} }
@ -260,7 +263,8 @@ static void stackContainerHide(uiControl *c)
s->containerHid = 1; s->containerHid = 1;
for (i = 0; i < s->len; i++) for (i = 0; i < s->len; i++)
uiControlContainerHide(s->controls[i].c); uiControlContainerHide(s->controls[i].c);
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }
static void stackEnable(uiControl *c) static void stackEnable(uiControl *c)
@ -359,7 +363,8 @@ void uiStackAdd(uiControl *st, uiControl *c, int stretchy)
if (s->parent != 0) if (s->parent != 0)
uiControlSetParent(s->controls[s->len].c, s->parent); uiControlSetParent(s->controls[s->len].c, s->parent);
s->len++; s->len++;
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }
int uiStackPadded(uiControl *c) int uiStackPadded(uiControl *c)
@ -374,5 +379,6 @@ void uiStackSetPadded(uiControl *c, int padded)
stack *s = (stack *) (c->data); stack *s = (stack *) (c->data);
s->padded = padded; s->padded = padded;
updateParent(s->parent); if (s->parent != NULL)
uiParentUpdate(s->parent);
} }

4
new/ui.h
View File

@ -40,7 +40,7 @@ struct uiControl {
void *internal; // for use by ui only void *internal; // for use by ui only
void (*destroy)(uiControl *); void (*destroy)(uiControl *);
uintptr_t (*handle)(uiControl *); uintptr_t (*handle)(uiControl *);
void (*setParent)(uiControl *, uiContainer *); void (*setParent)(uiControl *, uiParent *);
void (*removeParent)(uiControl *); void (*removeParent)(uiControl *);
void (*preferredSize)(uiControl *, uiSizing *, intmax_t *, intmax_t *); void (*preferredSize)(uiControl *, uiSizing *, intmax_t *, intmax_t *);
void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);
@ -56,7 +56,7 @@ struct uiControl {
}; };
void uiControlDestroy(uiControl *); void uiControlDestroy(uiControl *);
uintptr_t uiControlHandle(uiControl *); uintptr_t uiControlHandle(uiControl *);
void uiControlSetParent(uiControl *, uiContainer *); void uiControlSetParent(uiControl *, uiParent *);
void uiControlRemoveParent(uiControl *); void uiControlRemoveParent(uiControl *);
void uiControlPreferredSize(uiControl *, uiSizing *, intmax_t *width, intmax_t *height); void uiControlPreferredSize(uiControl *, uiSizing *, intmax_t *width, intmax_t *height);
void uiControlResize(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void uiControlResize(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);

2
new/uipriv.h
View File

@ -8,5 +8,3 @@ extern void *uiAlloc(size_t, const char *);
#define uiNew(T) ((T *) uiAlloc(sizeof (T), #T )) #define uiNew(T) ((T *) uiAlloc(sizeof (T), #T ))
extern void *uiRealloc(void *, size_t, const char *); extern void *uiRealloc(void *, size_t, const char *);
extern void uiFree(void *); extern void uiFree(void *);
extern void updateParent(uintptr_t);