mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added text alignment to toggleables

Browse Source
This commit is contained in:
Jacob Ahnstedt 2023-11-26 10:25:36 +01:00
parent 208dbc506e
commit c5ee9a58ed
5 changed files with 140 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
demo/common/overview.c
View File

@ -43,7 +43,7 @@ overview(struct nk_context *ctx)
show_app_about = nk_true; show_app_about = nk_true;
nk_progress(ctx, &prog, 100, NK_MODIFIABLE); nk_progress(ctx, &prog, 100, NK_MODIFIABLE);
nk_slider_int(ctx, 0, &slider, 16, 1); nk_slider_int(ctx, 0, &slider, 16, 1);
nk_checkbox_label(ctx, "check", &check, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "check", &check, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_menu_end(ctx); nk_menu_end(ctx);
} }
/* menu #2 */ /* menu #2 */
@ -102,7 +102,7 @@ overview(struct nk_context *ctx)
nk_layout_row_push(ctx, 70); nk_layout_row_push(ctx, 70);
nk_progress(ctx, &mprog, 100, NK_MODIFIABLE); nk_progress(ctx, &mprog, 100, NK_MODIFIABLE);
nk_slider_int(ctx, 0, &mslider, 16, 1); nk_slider_int(ctx, 0, &mslider, 16, 1);
nk_checkbox_label(ctx, "check", &mcheck, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "check", &mcheck, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_menubar_end(ctx); nk_menubar_end(ctx);
} }
@ -123,15 +123,15 @@ overview(struct nk_context *ctx)
/* window flags */ /* window flags */
if (nk_tree_push(ctx, NK_TREE_TAB, "Window", NK_MINIMIZED)) { if (nk_tree_push(ctx, NK_TREE_TAB, "Window", NK_MINIMIZED)) {
nk_layout_row_dynamic(ctx, 30, 2); nk_layout_row_dynamic(ctx, 30, 2);
nk_checkbox_label(ctx, "Menu", &show_menu, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Menu", &show_menu, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Titlebar", &window_flags, NK_WINDOW_TITLE, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Titlebar", &window_flags, NK_WINDOW_TITLE, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Border", &window_flags, NK_WINDOW_BORDER, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Border", &window_flags, NK_WINDOW_BORDER, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Resizable", &window_flags, NK_WINDOW_SCALABLE, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Resizable", &window_flags, NK_WINDOW_SCALABLE, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Movable", &window_flags, NK_WINDOW_MOVABLE, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Movable", &window_flags, NK_WINDOW_MOVABLE, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "No Scrollbar", &window_flags, NK_WINDOW_NO_SCROLLBAR, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "No Scrollbar", &window_flags, NK_WINDOW_NO_SCROLLBAR, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Minimizable", &window_flags, NK_WINDOW_MINIMIZABLE, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Minimizable", &window_flags, NK_WINDOW_MINIMIZABLE, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_flags_label(ctx, "Scale Left", &window_flags, NK_WINDOW_SCALE_LEFT, NK_WIDGET_LEFT); nk_checkbox_flags_label(ctx, "Scale Left", &window_flags, NK_WINDOW_SCALE_LEFT, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, "Disable widgets", &disable_widgets, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Disable widgets", &disable_widgets, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_tree_pop(ctx); nk_tree_pop(ctx);
} }
@ -141,8 +141,10 @@ overview(struct nk_context *ctx)
if (nk_tree_push(ctx, NK_TREE_TAB, "Widgets", NK_MINIMIZED)) if (nk_tree_push(ctx, NK_TREE_TAB, "Widgets", NK_MINIMIZED))
{ {
enum options {A,B,C}; enum options {A,B,C};
static int checkbox_left; static int checkbox_left_text_left;
static int checkbox_right; static int checkbox_left_text_right;
static int checkbox_right_text_right;
static int checkbox_right_text_left;
static int option_left; static int option_left;
static int option_right; static int option_right;
if (nk_tree_push(ctx, NK_TREE_NODE, "Text", NK_MINIMIZED)) if (nk_tree_push(ctx, NK_TREE_NODE, "Text", NK_MINIMIZED))
@ -211,18 +213,20 @@ overview(struct nk_context *ctx)
static const float ratio[] = {120, 150}; static const float ratio[] = {120, 150};
nk_layout_row_dynamic(ctx, 0, 1); nk_layout_row_dynamic(ctx, 0, 1);
nk_checkbox_label(ctx, "Checkbox Left", &checkbox_left, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Checkbox Left Text Left", &checkbox_left_text_left, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, "Checkbox Right", &checkbox_right, NK_WIDGET_RIGHT); nk_checkbox_label(ctx, "Checkbox Left Text Right", &checkbox_left_text_right, NK_WIDGET_LEFT, NK_TEXT_RIGHT);
nk_checkbox_label(ctx, "Checkbox Right Text Right", &checkbox_right_text_right, NK_WIDGET_RIGHT, NK_TEXT_RIGHT);
nk_checkbox_label(ctx, "Checkbox Right Text Left", &checkbox_right_text_left, NK_WIDGET_RIGHT, NK_TEXT_LEFT);
nk_layout_row_static(ctx, 30, 80, 3); nk_layout_row_static(ctx, 30, 80, 3);
option_left = nk_option_label(ctx, "optionA", option_left == A, NK_WIDGET_LEFT) ? A : option_left; option_left = nk_option_label(ctx, "optionA", option_left == A, NK_WIDGET_LEFT, NK_TEXT_LEFT) ? A : option_left;
option_left = nk_option_label(ctx, "optionB", option_left == B, NK_WIDGET_LEFT) ? B : option_left; option_left = nk_option_label(ctx, "optionB", option_left == B, NK_WIDGET_LEFT, NK_TEXT_LEFT) ? B : option_left;
option_left = nk_option_label(ctx, "optionC", option_left == C, NK_WIDGET_LEFT) ? C : option_left; option_left = nk_option_label(ctx, "optionC", option_left == C, NK_WIDGET_LEFT, NK_TEXT_LEFT) ? C : option_left;
nk_layout_row_static(ctx, 30, 80, 3); nk_layout_row_static(ctx, 30, 80, 3);
option_right = nk_option_label(ctx, "optionA", option_right == A, NK_WIDGET_RIGHT) ? A : option_right; option_right = nk_option_label(ctx, "optionA", option_right == A, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? A : option_right;
option_right = nk_option_label(ctx, "optionB", option_right == B, NK_WIDGET_RIGHT) ? B : option_right; option_right = nk_option_label(ctx, "optionB", option_right == B, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? B : option_right;
option_right = nk_option_label(ctx, "optionC", option_right == C, NK_WIDGET_RIGHT) ? C : option_right; option_right = nk_option_label(ctx, "optionC", option_right == C, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? C : option_right;
nk_layout_row(ctx, NK_STATIC, 30, 2, ratio); nk_layout_row(ctx, NK_STATIC, 30, 2, ratio);
nk_labelf(ctx, NK_TEXT_LEFT, "Slider int"); nk_labelf(ctx, NK_TEXT_LEFT, "Slider int");
@ -259,7 +263,7 @@ overview(struct nk_context *ctx)
{ {
static int inactive = 1; static int inactive = 1;
nk_layout_row_dynamic(ctx, 30, 1); nk_layout_row_dynamic(ctx, 30, 1);
nk_checkbox_label(ctx, "Inactive", &inactive, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Inactive", &inactive, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_layout_row_static(ctx, 30, 80, 1); nk_layout_row_static(ctx, 30, 80, 1);
if (inactive) { if (inactive) {
@ -375,8 +379,8 @@ overview(struct nk_context *ctx)
#endif #endif
nk_layout_row_dynamic(ctx, 25, 2); nk_layout_row_dynamic(ctx, 25, 2);
col_mode = nk_option_label(ctx, "RGB", col_mode == COL_RGB, NK_WIDGET_LEFT) ? COL_RGB : col_mode; col_mode = nk_option_label(ctx, "RGB", col_mode == COL_RGB, NK_WIDGET_LEFT, NK_TEXT_LEFT) ? COL_RGB : col_mode;
col_mode = nk_option_label(ctx, "HSV", col_mode == COL_HSV, NK_WIDGET_LEFT) ? COL_HSV : col_mode; col_mode = nk_option_label(ctx, "HSV", col_mode == COL_HSV, NK_WIDGET_LEFT, NK_TEXT_LEFT) ? COL_HSV : col_mode;
nk_layout_row_dynamic(ctx, 25, 1); nk_layout_row_dynamic(ctx, 25, 1);
if (col_mode == COL_RGB) { if (col_mode == COL_RGB) {
@ -412,10 +416,10 @@ overview(struct nk_context *ctx)
sprintf(buffer, "%lu", sum); sprintf(buffer, "%lu", sum);
if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) { if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) {
nk_layout_row_dynamic(ctx, 30, 1); nk_layout_row_dynamic(ctx, 30, 1);
nk_checkbox_label(ctx, weapons[0], &check_values[0], NK_WIDGET_LEFT); nk_checkbox_label(ctx, weapons[0], &check_values[0], NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, weapons[1], &check_values[1], NK_WIDGET_LEFT); nk_checkbox_label(ctx, weapons[1], &check_values[1], NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, weapons[2], &check_values[2], NK_WIDGET_LEFT); nk_checkbox_label(ctx, weapons[2], &check_values[2], NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, weapons[3], &check_values[3], NK_WIDGET_LEFT); nk_checkbox_label(ctx, weapons[3], &check_values[3], NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_combo_end(ctx); nk_combo_end(ctx);
} }
@ -724,7 +728,7 @@ overview(struct nk_context *ctx)
static int slider = 10; static int slider = 10;
nk_layout_row_dynamic(ctx, 25, 1); nk_layout_row_dynamic(ctx, 25, 1);
nk_checkbox_label(ctx, "Menu", &show_menu, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Menu", &show_menu, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_progress(ctx, &prog, 100, NK_MODIFIABLE); nk_progress(ctx, &prog, 100, NK_MODIFIABLE);
nk_slider_int(ctx, 0, &slider, 16, 1); nk_slider_int(ctx, 0, &slider, 16, 1);
if (nk_contextual_item_label(ctx, "About", NK_TEXT_CENTERED)) if (nk_contextual_item_label(ctx, "About", NK_TEXT_CENTERED))
@ -891,9 +895,9 @@ overview(struct nk_context *ctx)
if (group_titlebar) group_flags |= NK_WINDOW_TITLE; if (group_titlebar) group_flags |= NK_WINDOW_TITLE;
nk_layout_row_dynamic(ctx, 30, 3); nk_layout_row_dynamic(ctx, 30, 3);
nk_checkbox_label(ctx, "Titlebar", &group_titlebar, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Titlebar", &group_titlebar, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, "Border", &group_border, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "Border", &group_border, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_checkbox_label(ctx, "No Scrollbar", &group_no_scrollbar, NK_WIDGET_LEFT); nk_checkbox_label(ctx, "No Scrollbar", &group_no_scrollbar, NK_WIDGET_LEFT, NK_TEXT_LEFT);
nk_layout_row_begin(ctx, NK_STATIC, 22, 3); nk_layout_row_begin(ctx, NK_STATIC, 22, 3);
nk_layout_row_push(ctx, 50); nk_layout_row_push(ctx, 50);

104
nuklear.h
View File

@ -3205,23 +3205,23 @@ NK_API nk_bool nk_button_pop_behavior(struct nk_context*);
* CHECKBOX * CHECKBOX
* *
* ============================================================================= */ * ============================================================================= */
NK_API nk_bool nk_check_label(struct nk_context*, const char*, nk_bool active, nk_flags alignment); NK_API nk_bool nk_check_label(struct nk_context*, const char*, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_check_text(struct nk_context*, const char*, int, nk_bool active, nk_flags alignment); NK_API nk_bool nk_check_text(struct nk_context*, const char*, int, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API unsigned nk_check_flags_label(struct nk_context*, const char*, unsigned int flags, unsigned int value, nk_flags alignment); NK_API unsigned nk_check_flags_label(struct nk_context*, const char*, unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API unsigned nk_check_flags_text(struct nk_context*, const char*, int, unsigned int flags, unsigned int value, nk_flags alignment); NK_API unsigned nk_check_flags_text(struct nk_context*, const char*, int, unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_label(struct nk_context*, const char*, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_checkbox_label(struct nk_context*, const char*, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_checkbox_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_flags_label(struct nk_context*, const char*, unsigned int *flags, unsigned int value, nk_flags alignment); NK_API nk_bool nk_checkbox_flags_label(struct nk_context*, const char*, unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsigned int *flags, unsigned int value, nk_flags alignment); NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
/* ============================================================================= /* =============================================================================
* *
* RADIO BUTTON * RADIO BUTTON
* *
* ============================================================================= */ * ============================================================================= */
NK_API nk_bool nk_radio_label(struct nk_context*, const char*, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_radio_label(struct nk_context*, const char*, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_radio_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_radio_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_option_label(struct nk_context*, const char*, nk_bool active, nk_flags alignment); NK_API nk_bool nk_option_label(struct nk_context*, const char*, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_option_text(struct nk_context*, const char*, int, nk_bool active, nk_flags alignment); NK_API nk_bool nk_option_text(struct nk_context*, const char*, int, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
/* ============================================================================= /* =============================================================================
* *
* SELECTABLE * SELECTABLE
@ -6078,9 +6078,9 @@ enum nk_toggle_type {
NK_TOGGLE_OPTION NK_TOGGLE_OPTION
}; };
NK_LIB nk_bool nk_toggle_behavior(const struct nk_input *in, struct nk_rect select, nk_flags *state, nk_bool active); NK_LIB nk_bool nk_toggle_behavior(const struct nk_input *in, struct nk_rect select, nk_flags *state, nk_bool active);
NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags alignment); NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags alignment); NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font, nk_flags alignment); NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
/* progress */ /* progress */
NK_LIB nk_size nk_progress_behavior(nk_flags *state, struct nk_input *in, struct nk_rect r, struct nk_rect cursor, nk_size max, nk_size value, nk_bool modifiable); NK_LIB nk_size nk_progress_behavior(nk_flags *state, struct nk_input *in, struct nk_rect r, struct nk_rect cursor, nk_size max, nk_size value, nk_bool modifiable);
@ -24722,7 +24722,7 @@ nk_draw_checkbox(struct nk_command_buffer *out,
nk_flags state, const struct nk_style_toggle *style, nk_bool active, nk_flags state, const struct nk_style_toggle *style, nk_bool active,
const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *label, const struct nk_rect *selector,
const struct nk_rect *cursors, const char *string, int len, const struct nk_rect *cursors, const char *string, int len,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
const struct nk_style_item *background; const struct nk_style_item *background;
const struct nk_style_item *cursor; const struct nk_style_item *cursor;
@ -24747,7 +24747,7 @@ nk_draw_checkbox(struct nk_command_buffer *out,
text.padding.x = 0; text.padding.x = 0;
text.padding.y = 0; text.padding.y = 0;
text.background = style->text_background; text.background = style->text_background;
nk_widget_text(out, *label, string, len, &text, alignment, font); nk_widget_text(out, *label, string, len, &text, text_alignment, font);
/* draw background and cursor */ /* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) { if (background->type == NK_STYLE_ITEM_COLOR) {
@ -24765,7 +24765,7 @@ nk_draw_option(struct nk_command_buffer *out,
nk_flags state, const struct nk_style_toggle *style, nk_bool active, nk_flags state, const struct nk_style_toggle *style, nk_bool active,
const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *label, const struct nk_rect *selector,
const struct nk_rect *cursors, const char *string, int len, const struct nk_rect *cursors, const char *string, int len,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
const struct nk_style_item *background; const struct nk_style_item *background;
const struct nk_style_item *cursor; const struct nk_style_item *cursor;
@ -24790,7 +24790,7 @@ nk_draw_option(struct nk_command_buffer *out,
text.padding.x = 0; text.padding.x = 0;
text.padding.y = 0; text.padding.y = 0;
text.background = style->text_background; text.background = style->text_background;
nk_widget_text(out, *label, string, len, &text, alignment, font); nk_widget_text(out, *label, string, len, &text, text_alignment, font);
/* draw background and cursor */ /* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) { if (background->type == NK_STYLE_ITEM_COLOR) {
@ -24808,7 +24808,7 @@ nk_do_toggle(nk_flags *state,
struct nk_command_buffer *out, struct nk_rect r, struct nk_command_buffer *out, struct nk_rect r,
nk_bool *active, const char *str, int len, enum nk_toggle_type type, nk_bool *active, const char *str, int len, enum nk_toggle_type type,
const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_style_toggle *style, const struct nk_input *in,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int was_active; int was_active;
struct nk_rect allocated_space; struct nk_rect allocated_space;
@ -24828,7 +24828,7 @@ nk_do_toggle(nk_flags *state,
allocated_space = r; allocated_space = r;
if (alignment & NK_WIDGET_ALIGN_RIGHT) { if (widget_alignment & NK_WIDGET_ALIGN_RIGHT) {
r.x = r.x + r.w - font->height - style->padding.x; r.x = r.x + r.w - font->height - style->padding.x;
r.w = font->height; r.w = font->height;
} }
@ -24853,14 +24853,14 @@ nk_do_toggle(nk_flags *state,
label.y = select.y; label.y = select.y;
label.h = select.w; label.h = select.w;
if (alignment & NK_WIDGET_ALIGN_LEFT) { if (widget_alignment & NK_WIDGET_ALIGN_RIGHT) {
/* label behind the selector */
label.x = select.x + select.w + style->spacing;
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
} else {
/* label in front of the selector */ /* label in front of the selector */
label.x = allocated_space.x; label.x = allocated_space.x;
label.w = allocated_space.w - select.w - style->spacing * 2; label.w = allocated_space.w - select.w - style->spacing * 2;
} else {
/* label behind the selector */
label.x = select.x + select.w + style->spacing;
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
} }
/* update selector */ /* update selector */
@ -24871,9 +24871,9 @@ nk_do_toggle(nk_flags *state,
if (style->draw_begin) if (style->draw_begin)
style->draw_begin(out, style->userdata); style->draw_begin(out, style->userdata);
if (type == NK_TOGGLE_CHECK) { if (type == NK_TOGGLE_CHECK) {
nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font, alignment); nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font, widget_alignment, text_alignment);
} else { } else {
nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font, alignment); nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font, widget_alignment, text_alignment);
} }
if (style->draw_end) if (style->draw_end)
style->draw_end(out, style->userdata); style->draw_end(out, style->userdata);
@ -24885,7 +24885,7 @@ nk_do_toggle(nk_flags *state,
* *
* --------------------------------------------------------------*/ * --------------------------------------------------------------*/
NK_API nk_bool NK_API nk_bool
nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active, nk_flags alignment) nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
struct nk_window *win; struct nk_window *win;
struct nk_panel *layout; struct nk_panel *layout;
@ -24909,25 +24909,25 @@ nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active,
if (!state) return active; if (!state) return active;
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input; in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active, nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active,
text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, alignment); text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, widget_alignment, text_alignment);
return active; return active;
} }
NK_API unsigned int NK_API unsigned int
nk_check_flags_text(struct nk_context *ctx, const char *text, int len, nk_check_flags_text(struct nk_context *ctx, const char *text, int len,
unsigned int flags, unsigned int value, nk_flags alignment) unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_active; int old_active;
NK_ASSERT(ctx); NK_ASSERT(ctx);
NK_ASSERT(text); NK_ASSERT(text);
if (!ctx || !text) return flags; if (!ctx || !text) return flags;
old_active = (int)((flags & value) & value); old_active = (int)((flags & value) & value);
if (nk_check_text(ctx, text, len, old_active, alignment)) if (nk_check_text(ctx, text, len, old_active, widget_alignment, text_alignment))
flags |= value; flags |= value;
else flags &= ~value; else flags &= ~value;
return flags; return flags;
} }
NK_API nk_bool NK_API nk_bool
nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags alignment) nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_val; int old_val;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -24935,12 +24935,12 @@ nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *act
NK_ASSERT(active); NK_ASSERT(active);
if (!ctx || !text || !active) return 0; if (!ctx || !text || !active) return 0;
old_val = *active; old_val = *active;
*active = nk_check_text(ctx, text, len, *active, alignment); *active = nk_check_text(ctx, text, len, *active, widget_alignment, text_alignment);
return old_val != *active; return old_val != *active;
} }
NK_API nk_bool NK_API nk_bool
nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len, nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len,
unsigned int *flags, unsigned int value, nk_flags alignment) unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
nk_bool active; nk_bool active;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -24949,30 +24949,30 @@ nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len,
if (!ctx || !text || !flags) return 0; if (!ctx || !text || !flags) return 0;
active = (int)((*flags & value) & value); active = (int)((*flags & value) & value);
if (nk_checkbox_text(ctx, text, len, &active, alignment)) { if (nk_checkbox_text(ctx, text, len, &active, widget_alignment, text_alignment)) {
if (active) *flags |= value; if (active) *flags |= value;
else *flags &= ~value; else *flags &= ~value;
return 1; return 1;
} }
return 0; return 0;
} }
NK_API nk_bool nk_check_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags alignment) NK_API nk_bool nk_check_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_check_text(ctx, label, nk_strlen(label), active, alignment); return nk_check_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API unsigned int nk_check_flags_label(struct nk_context *ctx, const char *label, NK_API unsigned int nk_check_flags_label(struct nk_context *ctx, const char *label,
unsigned int flags, unsigned int value, nk_flags alignment) unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_check_flags_text(ctx, label, nk_strlen(label), flags, value, alignment); return nk_check_flags_text(ctx, label, nk_strlen(label), flags, value, widget_alignment, text_alignment);
} }
NK_API nk_bool nk_checkbox_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags alignment) NK_API nk_bool nk_checkbox_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_checkbox_text(ctx, label, nk_strlen(label), active, alignment); return nk_checkbox_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label, NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label,
unsigned int *flags, unsigned int value, nk_flags alignment) unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_checkbox_flags_text(ctx, label, nk_strlen(label), flags, value, alignment); return nk_checkbox_flags_text(ctx, label, nk_strlen(label), flags, value, widget_alignment, text_alignment);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* *
@ -24980,7 +24980,7 @@ NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label
* *
* --------------------------------------------------------------*/ * --------------------------------------------------------------*/
NK_API nk_bool NK_API nk_bool
nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags alignment) nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
struct nk_window *win; struct nk_window *win;
struct nk_panel *layout; struct nk_panel *layout;
@ -25004,11 +25004,11 @@ nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_act
if (!state) return (int)state; if (!state) return (int)state;
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input; in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active, nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active,
text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, alignment); text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, widget_alignment, text_alignment);
return is_active; return is_active;
} }
NK_API nk_bool NK_API nk_bool
nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags alignment) nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_value; int old_value;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -25016,18 +25016,18 @@ nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active
NK_ASSERT(active); NK_ASSERT(active);
if (!ctx || !text || !active) return 0; if (!ctx || !text || !active) return 0;
old_value = *active; old_value = *active;
*active = nk_option_text(ctx, text, len, old_value, alignment); *active = nk_option_text(ctx, text, len, old_value, widget_alignment, text_alignment);
return old_value != *active; return old_value != *active;
} }
NK_API nk_bool NK_API nk_bool
nk_option_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags alignment) nk_option_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_option_text(ctx, label, nk_strlen(label), active, alignment); return nk_option_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API nk_bool NK_API nk_bool
nk_radio_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags alignment) nk_radio_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_radio_text(ctx, label, nk_strlen(label), active, alignment); return nk_radio_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }

24
src/nuklear.h
View File

@ -2983,23 +2983,23 @@ NK_API nk_bool nk_button_pop_behavior(struct nk_context*);
* CHECKBOX * CHECKBOX
* *
* ============================================================================= */ * ============================================================================= */
NK_API nk_bool nk_check_label(struct nk_context*, const char*, nk_bool active, nk_flags alignment); NK_API nk_bool nk_check_label(struct nk_context*, const char*, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_check_text(struct nk_context*, const char*, int, nk_bool active, nk_flags alignment); NK_API nk_bool nk_check_text(struct nk_context*, const char*, int, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API unsigned nk_check_flags_label(struct nk_context*, const char*, unsigned int flags, unsigned int value, nk_flags alignment); NK_API unsigned nk_check_flags_label(struct nk_context*, const char*, unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API unsigned nk_check_flags_text(struct nk_context*, const char*, int, unsigned int flags, unsigned int value, nk_flags alignment); NK_API unsigned nk_check_flags_text(struct nk_context*, const char*, int, unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_label(struct nk_context*, const char*, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_checkbox_label(struct nk_context*, const char*, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_checkbox_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_flags_label(struct nk_context*, const char*, unsigned int *flags, unsigned int value, nk_flags alignment); NK_API nk_bool nk_checkbox_flags_label(struct nk_context*, const char*, unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsigned int *flags, unsigned int value, nk_flags alignment); NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment);
/* ============================================================================= /* =============================================================================
* *
* RADIO BUTTON * RADIO BUTTON
* *
* ============================================================================= */ * ============================================================================= */
NK_API nk_bool nk_radio_label(struct nk_context*, const char*, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_radio_label(struct nk_context*, const char*, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_radio_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags alignment); NK_API nk_bool nk_radio_text(struct nk_context*, const char*, int, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_option_label(struct nk_context*, const char*, nk_bool active, nk_flags alignment); NK_API nk_bool nk_option_label(struct nk_context*, const char*, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
NK_API nk_bool nk_option_text(struct nk_context*, const char*, int, nk_bool active, nk_flags alignment); NK_API nk_bool nk_option_text(struct nk_context*, const char*, int, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
/* ============================================================================= /* =============================================================================
* *
* SELECTABLE * SELECTABLE

6
src/nuklear_internal.h
View File

@ -255,9 +255,9 @@ enum nk_toggle_type {
NK_TOGGLE_OPTION NK_TOGGLE_OPTION
}; };
NK_LIB nk_bool nk_toggle_behavior(const struct nk_input *in, struct nk_rect select, nk_flags *state, nk_bool active); NK_LIB nk_bool nk_toggle_behavior(const struct nk_input *in, struct nk_rect select, nk_flags *state, nk_bool active);
NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags alignment); NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags alignment); NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font, nk_flags alignment); NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
/* progress */ /* progress */
NK_LIB nk_size nk_progress_behavior(nk_flags *state, struct nk_input *in, struct nk_rect r, struct nk_rect cursor, nk_size max, nk_size value, nk_bool modifiable); NK_LIB nk_size nk_progress_behavior(nk_flags *state, struct nk_input *in, struct nk_rect r, struct nk_rect cursor, nk_size max, nk_size value, nk_bool modifiable);

74
src/nuklear_toggle.c
View File

@ -26,7 +26,7 @@ nk_draw_checkbox(struct nk_command_buffer *out,
nk_flags state, const struct nk_style_toggle *style, nk_bool active, nk_flags state, const struct nk_style_toggle *style, nk_bool active,
const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *label, const struct nk_rect *selector,
const struct nk_rect *cursors, const char *string, int len, const struct nk_rect *cursors, const char *string, int len,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
const struct nk_style_item *background; const struct nk_style_item *background;
const struct nk_style_item *cursor; const struct nk_style_item *cursor;
@ -51,7 +51,7 @@ nk_draw_checkbox(struct nk_command_buffer *out,
text.padding.x = 0; text.padding.x = 0;
text.padding.y = 0; text.padding.y = 0;
text.background = style->text_background; text.background = style->text_background;
nk_widget_text(out, *label, string, len, &text, alignment, font); nk_widget_text(out, *label, string, len, &text, text_alignment, font);
/* draw background and cursor */ /* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) { if (background->type == NK_STYLE_ITEM_COLOR) {
@ -69,7 +69,7 @@ nk_draw_option(struct nk_command_buffer *out,
nk_flags state, const struct nk_style_toggle *style, nk_bool active, nk_flags state, const struct nk_style_toggle *style, nk_bool active,
const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *label, const struct nk_rect *selector,
const struct nk_rect *cursors, const char *string, int len, const struct nk_rect *cursors, const char *string, int len,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
const struct nk_style_item *background; const struct nk_style_item *background;
const struct nk_style_item *cursor; const struct nk_style_item *cursor;
@ -94,7 +94,7 @@ nk_draw_option(struct nk_command_buffer *out,
text.padding.x = 0; text.padding.x = 0;
text.padding.y = 0; text.padding.y = 0;
text.background = style->text_background; text.background = style->text_background;
nk_widget_text(out, *label, string, len, &text, alignment, font); nk_widget_text(out, *label, string, len, &text, text_alignment, font);
/* draw background and cursor */ /* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) { if (background->type == NK_STYLE_ITEM_COLOR) {
@ -112,7 +112,7 @@ nk_do_toggle(nk_flags *state,
struct nk_command_buffer *out, struct nk_rect r, struct nk_command_buffer *out, struct nk_rect r,
nk_bool *active, const char *str, int len, enum nk_toggle_type type, nk_bool *active, const char *str, int len, enum nk_toggle_type type,
const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_style_toggle *style, const struct nk_input *in,
const struct nk_user_font *font, nk_flags alignment) const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int was_active; int was_active;
struct nk_rect allocated_space; struct nk_rect allocated_space;
@ -132,7 +132,7 @@ nk_do_toggle(nk_flags *state,
allocated_space = r; allocated_space = r;
if (alignment & NK_WIDGET_ALIGN_RIGHT) { if (widget_alignment & NK_WIDGET_ALIGN_RIGHT) {
r.x = r.x + r.w - font->height - style->padding.x; r.x = r.x + r.w - font->height - style->padding.x;
r.w = font->height; r.w = font->height;
} }
@ -157,14 +157,14 @@ nk_do_toggle(nk_flags *state,
label.y = select.y; label.y = select.y;
label.h = select.w; label.h = select.w;
if (alignment & NK_WIDGET_ALIGN_LEFT) { if (widget_alignment & NK_WIDGET_ALIGN_RIGHT) {
/* label behind the selector */
label.x = select.x + select.w + style->spacing;
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
} else {
/* label in front of the selector */ /* label in front of the selector */
label.x = allocated_space.x; label.x = allocated_space.x;
label.w = allocated_space.w - select.w - style->spacing * 2; label.w = allocated_space.w - select.w - style->spacing * 2;
} else {
/* label behind the selector */
label.x = select.x + select.w + style->spacing;
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
} }
/* update selector */ /* update selector */
@ -175,9 +175,9 @@ nk_do_toggle(nk_flags *state,
if (style->draw_begin) if (style->draw_begin)
style->draw_begin(out, style->userdata); style->draw_begin(out, style->userdata);
if (type == NK_TOGGLE_CHECK) { if (type == NK_TOGGLE_CHECK) {
nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font, alignment); nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font, widget_alignment, text_alignment);
} else { } else {
nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font, alignment); nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font, widget_alignment, text_alignment);
} }
if (style->draw_end) if (style->draw_end)
style->draw_end(out, style->userdata); style->draw_end(out, style->userdata);
@ -189,7 +189,7 @@ nk_do_toggle(nk_flags *state,
* *
* --------------------------------------------------------------*/ * --------------------------------------------------------------*/
NK_API nk_bool NK_API nk_bool
nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active, nk_flags alignment) nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
struct nk_window *win; struct nk_window *win;
struct nk_panel *layout; struct nk_panel *layout;
@ -213,25 +213,25 @@ nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active,
if (!state) return active; if (!state) return active;
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input; in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active, nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active,
text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, alignment); text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, widget_alignment, text_alignment);
return active; return active;
} }
NK_API unsigned int NK_API unsigned int
nk_check_flags_text(struct nk_context *ctx, const char *text, int len, nk_check_flags_text(struct nk_context *ctx, const char *text, int len,
unsigned int flags, unsigned int value, nk_flags alignment) unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_active; int old_active;
NK_ASSERT(ctx); NK_ASSERT(ctx);
NK_ASSERT(text); NK_ASSERT(text);
if (!ctx || !text) return flags; if (!ctx || !text) return flags;
old_active = (int)((flags & value) & value); old_active = (int)((flags & value) & value);
if (nk_check_text(ctx, text, len, old_active, alignment)) if (nk_check_text(ctx, text, len, old_active, widget_alignment, text_alignment))
flags |= value; flags |= value;
else flags &= ~value; else flags &= ~value;
return flags; return flags;
} }
NK_API nk_bool NK_API nk_bool
nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags alignment) nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_val; int old_val;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -239,12 +239,12 @@ nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *act
NK_ASSERT(active); NK_ASSERT(active);
if (!ctx || !text || !active) return 0; if (!ctx || !text || !active) return 0;
old_val = *active; old_val = *active;
*active = nk_check_text(ctx, text, len, *active, alignment); *active = nk_check_text(ctx, text, len, *active, widget_alignment, text_alignment);
return old_val != *active; return old_val != *active;
} }
NK_API nk_bool NK_API nk_bool
nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len, nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len,
unsigned int *flags, unsigned int value, nk_flags alignment) unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
nk_bool active; nk_bool active;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -253,30 +253,30 @@ nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len,
if (!ctx || !text || !flags) return 0; if (!ctx || !text || !flags) return 0;
active = (int)((*flags & value) & value); active = (int)((*flags & value) & value);
if (nk_checkbox_text(ctx, text, len, &active, alignment)) { if (nk_checkbox_text(ctx, text, len, &active, widget_alignment, text_alignment)) {
if (active) *flags |= value; if (active) *flags |= value;
else *flags &= ~value; else *flags &= ~value;
return 1; return 1;
} }
return 0; return 0;
} }
NK_API nk_bool nk_check_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags alignment) NK_API nk_bool nk_check_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_check_text(ctx, label, nk_strlen(label), active, alignment); return nk_check_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API unsigned int nk_check_flags_label(struct nk_context *ctx, const char *label, NK_API unsigned int nk_check_flags_label(struct nk_context *ctx, const char *label,
unsigned int flags, unsigned int value, nk_flags alignment) unsigned int flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_check_flags_text(ctx, label, nk_strlen(label), flags, value, alignment); return nk_check_flags_text(ctx, label, nk_strlen(label), flags, value, widget_alignment, text_alignment);
} }
NK_API nk_bool nk_checkbox_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags alignment) NK_API nk_bool nk_checkbox_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_checkbox_text(ctx, label, nk_strlen(label), active, alignment); return nk_checkbox_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label, NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label,
unsigned int *flags, unsigned int value, nk_flags alignment) unsigned int *flags, unsigned int value, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_checkbox_flags_text(ctx, label, nk_strlen(label), flags, value, alignment); return nk_checkbox_flags_text(ctx, label, nk_strlen(label), flags, value, widget_alignment, text_alignment);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* *
@ -284,7 +284,7 @@ NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label
* *
* --------------------------------------------------------------*/ * --------------------------------------------------------------*/
NK_API nk_bool NK_API nk_bool
nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags alignment) nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
struct nk_window *win; struct nk_window *win;
struct nk_panel *layout; struct nk_panel *layout;
@ -308,11 +308,11 @@ nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_act
if (!state) return (int)state; if (!state) return (int)state;
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input; in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active, nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active,
text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, alignment); text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, widget_alignment, text_alignment);
return is_active; return is_active;
} }
NK_API nk_bool NK_API nk_bool
nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags alignment) nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
int old_value; int old_value;
NK_ASSERT(ctx); NK_ASSERT(ctx);
@ -320,17 +320,17 @@ nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active
NK_ASSERT(active); NK_ASSERT(active);
if (!ctx || !text || !active) return 0; if (!ctx || !text || !active) return 0;
old_value = *active; old_value = *active;
*active = nk_option_text(ctx, text, len, old_value, alignment); *active = nk_option_text(ctx, text, len, old_value, widget_alignment, text_alignment);
return old_value != *active; return old_value != *active;
} }
NK_API nk_bool NK_API nk_bool
nk_option_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags alignment) nk_option_label(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_option_text(ctx, label, nk_strlen(label), active, alignment); return nk_option_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }
NK_API nk_bool NK_API nk_bool
nk_radio_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags alignment) nk_radio_label(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
{ {
return nk_radio_text(ctx, label, nk_strlen(label), active, alignment); return nk_radio_text(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
} }