Rebuild nuklear.h

This commit is contained in:
Rob Loach 2024-09-30 13:40:37 -04:00 committed by Rob Loach
parent 0a28e3002b
commit 2ad47c08f1
1 changed files with 9 additions and 3 deletions

View File

@ -6002,6 +6002,7 @@ NK_LIB int nk_ifloord(double x);
NK_LIB int nk_ifloorf(float x); NK_LIB int nk_ifloorf(float x);
NK_LIB int nk_iceilf(float x); NK_LIB int nk_iceilf(float x);
NK_LIB int nk_log10(double n); NK_LIB int nk_log10(double n);
NK_LIB float nk_roundf(float x);
/* util */ /* util */
enum {NK_DO_NOT_STOP_ON_NEW_LINE, NK_STOP_ON_NEW_LINE}; enum {NK_DO_NOT_STOP_ON_NEW_LINE, NK_STOP_ON_NEW_LINE};
@ -6459,6 +6460,11 @@ nk_log10(double n)
if (neg) exp = -exp; if (neg) exp = -exp;
return exp; return exp;
} }
NK_LIB float
nk_roundf(float x)
{
return (x >= 0.0) ? nk_ifloorf(x + 0.5) : nk_iceilf(x - 0.5);
}
NK_API struct nk_rect NK_API struct nk_rect
nk_get_null_rect(void) nk_get_null_rect(void)
{ {
@ -17208,8 +17214,8 @@ nk_font_init(struct nk_font *font, float pixel_height,
* *
* ProggyClean.ttf * ProggyClean.ttf
* Copyright (c) 2004, 2005 Tristan Grimmer * Copyright (c) 2004, 2005 Tristan Grimmer
* MIT license (see License.txt in http://www.upperbounds.net/download/ProggyClean.ttf.zip) * MIT license https://github.com/bluescan/proggyfonts/blob/master/LICENSE
* Download and more information at http://upperbounds.net * Download and more information at https://github.com/bluescan/proggyfonts
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
@ -22424,7 +22430,7 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx,
panel_space = nk_layout_row_calculate_usable_space(&ctx->style, layout->type, panel_space = nk_layout_row_calculate_usable_space(&ctx->style, layout->type,
layout->bounds.w, layout->row.columns); layout->bounds.w, layout->row.columns);
#define NK_FRAC(x) (x - (float)(int)x) /* will be used to remove fookin gaps */ #define NK_FRAC(x) (x - (float)(int)nk_roundf(x)) /* will be used to remove fookin gaps */
/* calculate the width of one item inside the current layout space */ /* calculate the width of one item inside the current layout space */
switch (layout->row.type) { switch (layout->row.type) {
case NK_LAYOUT_DYNAMIC_FIXED: { case NK_LAYOUT_DYNAMIC_FIXED: {