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

Change nk_propertyi back to int

Browse Source
This commit is contained in:
Michael Aganier 2021-03-15 12:32:22 -04:00
parent f78b010c03
commit 5c6dcf6cd4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CHANGELOG
View File

@ -8,6 +8,7 @@
/// - [yy]: Minor version with non-breaking API and library changes /// - [yy]: Minor version with non-breaking API and library changes
/// - [zz]: Bug fix version with no direct changes to API /// - [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.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/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. /// - 2020/10/11 (4.06.1) - Fix C++ style comments which are not allowed in ISO C90.

2
src/nuklear.h
View File

@ -3157,7 +3157,7 @@ NK_API void nk_property_double(struct nk_context*, const char *name, double min,
/// ///
/// Returns the new modified integer value /// 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 /*/// #### nk_propertyf
/// Float property modifing a passed in value and returning the new value /// Float property modifing a passed in value and returning the new value
/// !!! WARNING /// !!! WARNING

2
src/nuklear_property.c
View File

@ -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); nk_property(ctx, name, &variant, inc_per_pixel, NK_FILTER_FLOAT);
*val = variant.value.d; *val = variant.value.d;
} }
NK_API nk_bool NK_API int
nk_propertyi(struct nk_context *ctx, const char *name, int min, int val, nk_propertyi(struct nk_context *ctx, const char *name, int min, int val,
int max, int step, float inc_per_pixel) int max, int step, float inc_per_pixel)
{ {