diff --git a/nuklear.h b/nuklear.h index 3b14a74..7d5503e 100644 --- a/nuklear.h +++ b/nuklear.h @@ -24907,16 +24907,18 @@ nk_draw_checkbox(struct nk_command_buffer *out, text.padding.y = 0; text.background = style->text_background; nk_widget_text(out, *label, string, len, &text, text_alignment, font); + /* draw background and cursor */ if (background->type == NK_STYLE_ITEM_COLOR) { - nk_stroke_rect(out, *selector, 2, 2, background->data.color); - } else nk_draw_image(out, *selector, &background->data.image, nk_white); + nk_stroke_rect(out, *selector, 2, 2, nk_rgb_factor(background->data.color, style->color_factor)); + } else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); if (active) { if (cursor->type == NK_STYLE_ITEM_IMAGE) - nk_draw_image(out, *cursors, &cursor->data.image, nk_white); - else nk_fill_rect(out, *cursors, 0, background->data.color); + nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor)); + else nk_fill_rect(out, *cursors, 0, nk_rgb_factor(background->data.color, style->color_factor)); } + } NK_LIB void nk_draw_option(struct nk_command_buffer *out, @@ -24944,20 +24946,21 @@ nk_draw_option(struct nk_command_buffer *out, text.text = style->text_normal; } - /* draw background and cursor */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_stroke_circle(out, *selector, 2, background->data.color); - } else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor))); - if (active) { - if (cursor->type == NK_STYLE_ITEM_IMAGE) - nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor))); - else nk_fill_circle(out, *cursors, background->data.color); - } - + text.text = nk_rgb_factor(text.text, style->color_factor); text.padding.x = 0; text.padding.y = 0; text.background = style->text_background; - nk_widget_text(out, *label, string, len, &text, NK_TEXT_LEFT, font); + nk_widget_text(out, *label, string, len, &text, text_alignment, font); + + /* draw background and cursor */ + if (background->type == NK_STYLE_ITEM_COLOR) { + nk_stroke_circle(out, *selector, 2, nk_rgb_factor(background->data.color, style->color_factor)); + } else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); + if (active) { + if (cursor->type == NK_STYLE_ITEM_IMAGE) + nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor)); + else nk_fill_circle(out, *cursors, background->data.color); + } } NK_LIB nk_bool nk_do_toggle(nk_flags *state, @@ -30539,6 +30542,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2022/12/23 (4.10.6) - Fix incorrect glyph index in nk_font_bake() /// - 2022/12/17 (4.10.5) - Fix nk_font_bake_pack() using TTC font offset incorrectly /// - 2022/10/24 (4.10.4) - Fix nk_str_{append,insert}_str_utf8 always returning 0 +/// - 2022/10/03 (4.10.4) - Updated the look and feel of checkboxes and radio buttons to be more distinguishable /// - 2022/09/03 (4.10.3) - Renamed the `null` texture variable to `tex_null` /// - 2022/08/01 (4.10.2) - Fix Apple Silicon with incorrect NK_SITE_TYPE and NK_POINTER_TYPE /// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than