From 9e0ae9f7520aec8da33f6a20524e7cc2f67fc185 Mon Sep 17 00:00:00 2001 From: Grisshink Date: Sat, 7 Dec 2024 21:05:22 +0300 Subject: [PATCH 1/2] Fix property border color --- nuklear.h | 2 +- src/nuklear_property.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nuklear.h b/nuklear.h index e74b3a82c..a9df3f63b 100644 --- a/nuklear.h +++ b/nuklear.h @@ -28737,7 +28737,7 @@ nk_draw_property(struct nk_command_buffer *out, const struct nk_style_property * case NK_STYLE_ITEM_COLOR: text.background = background->data.color; nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor)); - nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(background->data.color, style->color_factor)); + nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor)); break; } diff --git a/src/nuklear_property.c b/src/nuklear_property.c index 4386b0dd1..68b47ba7f 100644 --- a/src/nuklear_property.c +++ b/src/nuklear_property.c @@ -100,7 +100,7 @@ nk_draw_property(struct nk_command_buffer *out, const struct nk_style_property * case NK_STYLE_ITEM_COLOR: text.background = background->data.color; nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor)); - nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(background->data.color, style->color_factor)); + nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor)); break; } From d0ecf21884515400068250dcef6713949d3c6a9f Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 11 Dec 2024 13:15:04 -0500 Subject: [PATCH 2/2] Update version for fix border color for property widgets --- clib.json | 2 +- nuklear.h | 1 + src/CHANGELOG | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/clib.json b/clib.json index 576b8d5e2..dbc6ab17c 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.12.2", + "version": "4.12.3", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index a9df3f63b..8c3fea994 100644 --- a/nuklear.h +++ b/nuklear.h @@ -30698,6 +30698,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 /// +/// - 2024/12/11 (4.12.3) - Fix border color for property widgets /// - 2024/11/20 (4.12.2) - Fix int/float type conversion warnings in `nk_roundf` /// - 2024/03/07 (4.12.1) - Fix bitwise operations warnings in C++20 /// - 2023/11/26 (4.12.0) - Added an alignment option to checkboxes and radio buttons. diff --git a/src/CHANGELOG b/src/CHANGELOG index 555b92196..37c5bebf7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2024/12/11 (4.12.3) - Fix border color for property widgets /// - 2024/11/20 (4.12.2) - Fix int/float type conversion warnings in `nk_roundf` /// - 2024/03/07 (4.12.1) - Fix bitwise operations warnings in C++20 /// - 2023/11/26 (4.12.0) - Added an alignment option to checkboxes and radio buttons.