And added the alignment flag to the example program.
This commit is contained in:
parent
8a64a1dfb0
commit
bd66e70452
|
@ -36,6 +36,7 @@ static uiBox *vbox;
|
||||||
static uiLabel *caretLabel;
|
static uiLabel *caretLabel;
|
||||||
static uiCheckbox *showLineBounds;
|
static uiCheckbox *showLineBounds;
|
||||||
static uiFontButton *fontButton;
|
static uiFontButton *fontButton;
|
||||||
|
static uiCombobox *textAlign;
|
||||||
|
|
||||||
static int caretLine = -1;
|
static int caretLine = -1;
|
||||||
static size_t caretPos;
|
static size_t caretPos;
|
||||||
|
@ -205,6 +206,13 @@ static void changeFont(uiFontButton *b, void *data)
|
||||||
redraw();
|
redraw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void changeTextAlign(uiCombobox *c, void *data)
|
||||||
|
{
|
||||||
|
// note the order of the items added below
|
||||||
|
params.Align = (uiDrawTextLayoutAlign) uiComboboxSelected(textAlign);
|
||||||
|
redraw();
|
||||||
|
}
|
||||||
|
|
||||||
// TODO share?
|
// TODO share?
|
||||||
static uiCheckbox *newCheckbox(uiBox *box, const char *text)
|
static uiCheckbox *newCheckbox(uiBox *box, const char *text)
|
||||||
{
|
{
|
||||||
|
@ -220,14 +228,24 @@ struct example *mkHitTestExample(void)
|
||||||
{
|
{
|
||||||
panel = uiNewHorizontalBox();
|
panel = uiNewHorizontalBox();
|
||||||
vbox = uiNewVerticalBox();
|
vbox = uiNewVerticalBox();
|
||||||
|
// TODO the second vbox causes this not to stretch at least on OS X
|
||||||
uiBoxAppend(panel, uiControl(vbox), 1);
|
uiBoxAppend(panel, uiControl(vbox), 1);
|
||||||
caretLabel = uiNewLabel("Caret information is shown here");
|
caretLabel = uiNewLabel("Caret information is shown here");
|
||||||
uiBoxAppend(vbox, uiControl(caretLabel), 0);
|
uiBoxAppend(vbox, uiControl(caretLabel), 0);
|
||||||
showLineBounds = newCheckbox(vbox, "Show Line Bounds (for debugging metrics)");
|
showLineBounds = newCheckbox(vbox, "Show Line Bounds (for debugging metrics)");
|
||||||
|
vbox = uiNewVerticalBox();
|
||||||
|
uiBoxAppend(panel, uiControl(vbox), 0);
|
||||||
fontButton = uiNewFontButton();
|
fontButton = uiNewFontButton();
|
||||||
uiFontButtonOnChanged(fontButton, changeFont, NULL);
|
uiFontButtonOnChanged(fontButton, changeFont, NULL);
|
||||||
// TODO set the font button to the current defaultFont
|
// TODO set the font button to the current defaultFont
|
||||||
uiBoxAppend(panel, uiControl(fontButton), 0);
|
uiBoxAppend(vbox, uiControl(fontButton), 0);
|
||||||
|
textAlign = uiNewCombobox();
|
||||||
|
// note that these are in the order in the enum
|
||||||
|
uiComboboxAppend(textAlign, "Left");
|
||||||
|
uiComboboxAppend(textAlign, "Center");
|
||||||
|
uiComboboxAppend(textAlign, "Right");
|
||||||
|
uiComboboxOnSelected(textAlign, changeTextAlign, NULL);
|
||||||
|
uiBoxAppend(vbox, uiControl(textAlign), 0);
|
||||||
|
|
||||||
hitTestExample.name = "Hit-Testing and Grapheme Boundaries";
|
hitTestExample.name = "Hit-Testing and Grapheme Boundaries";
|
||||||
hitTestExample.panel = uiControl(panel);
|
hitTestExample.panel = uiControl(panel);
|
||||||
|
|
Loading…
Reference in New Issue