From a7281f903407b1289d7aa3078f2e9bfb22f7724b Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 9 Apr 2015 20:04:18 -0400 Subject: [PATCH] Added uiStackPadded(). --- new/stack.c | 7 ++++++- new/test.c | 15 +++++++++++++-- new/ui.h | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/new/stack.c b/new/stack.c index 338f18a..3a87257 100644 --- a/new/stack.c +++ b/new/stack.c @@ -255,7 +255,12 @@ void uiStackAdd(uiControl *st, uiControl *c, int stretchy) updateParent(s->parent); } -// TODO get padded +int uiStackPadded(uiControl *c) +{ + stack *s = (stack *) (c->data); + + return s->padded; +} void uiStackSetPadded(uiControl *c, int padded) { diff --git a/new/test.c b/new/test.c index c4a373e..6d43afb 100644 --- a/new/test.c +++ b/new/test.c @@ -98,6 +98,16 @@ static void forceSpacedOff(uiControl *c, void *data) uiCheckboxSetChecked(spaced, 0); } +static void showSpaced(uiControl *c, void *data) +{ + char msg[] = { 'm', ' ', '0', ' ', 'p', ' ', '0', '\0' }; + + // TODO margined + if (uiStackPadded(stacks[0])) + msg[6] = '1'; + uiEntrySetText(e, msg); +} + int main(int argc, char *argv[]) { uiInitError *err; @@ -158,10 +168,11 @@ int main(int argc, char *argv[]) uiButtonOnClicked(setButton, forceSpacedOff, NULL); uiStackAdd(stacks[4], getButton, 0); uiStackAdd(stacks[4], setButton, 0); + setButton = uiNewButton("Show"); + uiButtonOnClicked(setButton, showSpaced, NULL); + uiStackAdd(stacks[4], setButton, 0); uiStackAdd(stacks[0], stacks[4], 0); - // TODO get spaced values - uiWindowShow(w); uiMain(); printf("after uiMain()\n"); diff --git a/new/ui.h b/new/ui.h index f54b183..5a4ed3f 100644 --- a/new/ui.h +++ b/new/ui.h @@ -64,7 +64,7 @@ void uiButtonOnClicked(uiControl *, void (*)(uiControl *, void *), void *); uiControl *uiNewHorizontalStack(void); uiControl *uiNewVerticalStack(void); void uiStackAdd(uiControl *, uiControl *, int); -// TODO get padded +int uiStackPadded(uiControl *); void uiStackSetPadded(uiControl *, int); uiControl *uiNewEntry(void);