Added a test of having multiple uiRadioButtons in the same parent container and started a test of intrinsic sizes of all non-container controls.
This commit is contained in:
parent
6e94671782
commit
b130ddc04b
|
@ -5,8 +5,6 @@
|
||||||
// This is documented on the NSMatrix page, but the rest of the OS X documentation says to still use NSMatrix.
|
// This is documented on the NSMatrix page, but the rest of the OS X documentation says to still use NSMatrix.
|
||||||
// NSMatrix has weird quirks anyway...
|
// NSMatrix has weird quirks anyway...
|
||||||
|
|
||||||
// TODO check that multiple radio buttons on the same parent container work right
|
|
||||||
|
|
||||||
// LONGTERM 6 units of spacing between buttons, as suggested by Interface Builder?
|
// LONGTERM 6 units of spacing between buttons, as suggested by Interface Builder?
|
||||||
|
|
||||||
struct uiRadioButtons {
|
struct uiRadioButtons {
|
||||||
|
|
|
@ -19,6 +19,7 @@ CFILES += \
|
||||||
test/page10.c \
|
test/page10.c \
|
||||||
test/page11.c \
|
test/page11.c \
|
||||||
test/page12.c \
|
test/page12.c \
|
||||||
|
test/page13.c \
|
||||||
test/spaced.c
|
test/spaced.c
|
||||||
|
|
||||||
HFILES += \
|
HFILES += \
|
||||||
|
|
|
@ -47,7 +47,7 @@ int main(int argc, char *argv[])
|
||||||
uiWindow *w;
|
uiWindow *w;
|
||||||
uiBox *page2, *page3, *page4, *page5;
|
uiBox *page2, *page3, *page4, *page5;
|
||||||
uiBox *page6, *page7, *page8, *page9, *page10;
|
uiBox *page6, *page7, *page8, *page9, *page10;
|
||||||
uiBox *page11, *page12;
|
uiBox *page11, *page12, *page13;
|
||||||
uiTab *outerTab;
|
uiTab *outerTab;
|
||||||
uiTab *innerTab;
|
uiTab *innerTab;
|
||||||
int nomenus = 0;
|
int nomenus = 0;
|
||||||
|
@ -141,6 +141,9 @@ int main(int argc, char *argv[])
|
||||||
page12 = makePage12();
|
page12 = makePage12();
|
||||||
uiTabAppend(innerTab, "Page 12", uiControl(page12));
|
uiTabAppend(innerTab, "Page 12", uiControl(page12));
|
||||||
|
|
||||||
|
page13 = makePage13();
|
||||||
|
uiTabAppend(innerTab, "Page 13", uiControl(page13));
|
||||||
|
|
||||||
if (startspaced)
|
if (startspaced)
|
||||||
setSpaced(1);
|
setSpaced(1);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
// 28 may 2016
|
||||||
|
#include "test.h"
|
||||||
|
|
||||||
|
uiBox *makePage13(void)
|
||||||
|
{
|
||||||
|
uiBox *page13;
|
||||||
|
uiRadioButtons *rb;
|
||||||
|
uiButton *b;
|
||||||
|
|
||||||
|
page13 = newVerticalBox();
|
||||||
|
|
||||||
|
rb = uiNewRadioButtons();
|
||||||
|
uiRadioButtonsAppend(rb, "Item 1");
|
||||||
|
uiRadioButtonsAppend(rb, "Item 2");
|
||||||
|
uiRadioButtonsAppend(rb, "Item 3");
|
||||||
|
uiBoxAppend(page13, uiControl(rb), 0);
|
||||||
|
|
||||||
|
rb = uiNewRadioButtons();
|
||||||
|
uiRadioButtonsAppend(rb, "Item A");
|
||||||
|
uiRadioButtonsAppend(rb, "Item B");
|
||||||
|
uiBoxAppend(page13, uiControl(rb), 0);
|
||||||
|
|
||||||
|
b = uiNewButton("Horizontal");
|
||||||
|
uiBoxAppend(page13, uiControl(b), 0);
|
||||||
|
|
||||||
|
b = uiNewButton("Vertical");
|
||||||
|
uiBoxAppend(page13, uiControl(b), 0);
|
||||||
|
|
||||||
|
return page13;
|
||||||
|
}
|
|
@ -77,3 +77,6 @@ extern uiBox *makePage11(void);
|
||||||
|
|
||||||
// page12.c
|
// page12.c
|
||||||
extern uiBox *makePage12(void);
|
extern uiBox *makePage12(void);
|
||||||
|
|
||||||
|
// page13.c
|
||||||
|
extern uiBox *makePage13(void);
|
||||||
|
|
Loading…
Reference in New Issue