From 5c6dcf6cd425fdc5b9dbb3859e919ea22005d058 Mon Sep 17 00:00:00 2001 From: Michael Aganier Date: Mon, 15 Mar 2021 12:32:22 -0400 Subject: [PATCH] Change nk_propertyi back to int --- src/CHANGELOG | 1 + src/nuklear.h | 2 +- src/nuklear_property.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index c705aad..472e4f7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2020/12/19 (4.06.4) - Change nk_propertyi back to int /// - 2020/12/19 (4.06.3) - Update documentation for functions that now return nk_bool /// - 2020/12/19 (4.06.2) - Fix additional C++ style comments which are not allowed in ISO C90. /// - 2020/10/11 (4.06.1) - Fix C++ style comments which are not allowed in ISO C90. diff --git a/src/nuklear.h b/src/nuklear.h index a57e919..d9cb211 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -3157,7 +3157,7 @@ NK_API void nk_property_double(struct nk_context*, const char *name, double min, /// /// Returns the new modified integer value */ -NK_API nk_bool nk_propertyi(struct nk_context*, const char *name, int min, int val, int max, int step, float inc_per_pixel); +NK_API int nk_propertyi(struct nk_context*, const char *name, int min, int val, int max, int step, float inc_per_pixel); /*/// #### nk_propertyf /// Float property modifing a passed in value and returning the new value /// !!! WARNING diff --git a/src/nuklear_property.c b/src/nuklear_property.c index eef2f27..9851a8a 100644 --- a/src/nuklear_property.c +++ b/src/nuklear_property.c @@ -450,7 +450,7 @@ nk_property_double(struct nk_context *ctx, const char *name, nk_property(ctx, name, &variant, inc_per_pixel, NK_FILTER_FLOAT); *val = variant.value.d; } -NK_API nk_bool +NK_API int nk_propertyi(struct nk_context *ctx, const char *name, int min, int val, int max, int step, float inc_per_pixel) {