From 25cda15319d77c53ef763a233c7801381057caab Mon Sep 17 00:00:00 2001 From: Yukyduky Date: Fri, 13 Oct 2023 11:48:59 +0200 Subject: [PATCH] Fixed two copy paste mistakes --- nuklear.h | 5 +++-- src/nuklear_button.c | 2 +- src/nuklear_chart.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nuklear.h b/nuklear.h index 0d9b9a2..0604017 100644 --- a/nuklear.h +++ b/nuklear.h @@ -24023,7 +24023,7 @@ nk_draw_button(struct nk_command_buffer *out, nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_NINE_SLICE: - nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_rgb_factor(nk_white, style->color_factor), style->color_factor)); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_COLOR: nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor)); @@ -28421,7 +28421,7 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type, nk_draw_image(&win->buffer, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_NINE_SLICE: - nk_draw_image(&win->buffer, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); + nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_COLOR: nk_fill_rect(&win->buffer, bounds, style->rounding, nk_rgb_factor(style->border_color, style->color_factor)); @@ -29905,6 +29905,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2023/10/11 (4.11.0) - Added nk_widget_disable_begin() and nk_widget_disable_end() /// - 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 diff --git a/src/nuklear_button.c b/src/nuklear_button.c index 98c2057..423e0df 100644 --- a/src/nuklear_button.c +++ b/src/nuklear_button.c @@ -103,7 +103,7 @@ nk_draw_button(struct nk_command_buffer *out, nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_NINE_SLICE: - nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_rgb_factor(nk_white, style->color_factor), style->color_factor)); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_COLOR: nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor)); diff --git a/src/nuklear_chart.c b/src/nuklear_chart.c index ba886e2..b71caf2 100644 --- a/src/nuklear_chart.c +++ b/src/nuklear_chart.c @@ -62,7 +62,7 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type, nk_draw_image(&win->buffer, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_NINE_SLICE: - nk_draw_image(&win->buffer, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor)); + nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor)); break; case NK_STYLE_ITEM_COLOR: nk_fill_rect(&win->buffer, bounds, style->rounding, nk_rgb_factor(style->border_color, style->color_factor));