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

Fix bug where padding was subtracted from widget

Browse Source 
This caused combo boxes to draw its items before the
panel padding, causing the text to be clipped off.

The code deleted here seems to have been an effort to
solve what 14dd68e solved so it makes sense that these
would conflict. I'm pretty sure 14dd68e is the correct
solution though and this was some old hack.
This commit is contained in:
Jimmi Holst Christensen 2020-03-11 18:45:36 +01:00
parent 6840fb2494
commit 75c71790f3
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nuklear.h
View File

@ -22839,16 +22839,6 @@ nk_widget_fitting(struct nk_rect *bounds, struct nk_context *ctx,
style = &ctx->style;
layout = win->layout;
state = nk_widget(bounds, ctx);
panel_padding = nk_panel_get_padding(style, layout->type);
if (layout->row.index == 1) {
bounds->w += panel_padding.x;
bounds->x -= panel_padding.x;
} else bounds->x -= item_padding.x;
if (layout->row.index == layout->row.columns)
bounds->w += panel_padding.x;
else bounds->w += item_padding.x;
return state;
}
NK_API void
@ -29110,6 +29100,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
/// - [yy]: Minor version with non-breaking API and library changes
/// - [zz]: Bug fix version with no direct changes to API
///
/// - 2020/03/11 (4.01.8) - Fix bug where padding is subtracted from widget
/// - 2020/03/06 (4.01.7) - Fix bug where width padding was applied twice
/// - 2020/02/06 (4.01.6) - Update stb_truetype.h and stb_rect_pack.h and separate them
/// - 2019/12/10 (4.01.5) - Fix off-by-one error in NK_INTERSECT

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "nuklear",
"version": "4.01.7",
"version": "4.01.8",
"repo": "Immediate-Mode-UI/Nuklear",
"description": "A small ANSI C gui toolkit",
"keywords": ["gl", "ui", "toolkit"],

1
src/CHANGELOG
View File

@ -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/03/11 (4.01.8) - Fix bug where padding is subtracted from widget
/// - 2020/03/06 (4.01.7) - Fix bug where width padding was applied twice
/// - 2020/02/06 (4.01.6) - Update stb_truetype.h and stb_rect_pack.h and separate them
/// - 2019/12/10 (4.01.5) - Fix off-by-one error in NK_INTERSECT

10
src/nuklear_widget.c
View File

@ -200,16 +200,6 @@ nk_widget_fitting(struct nk_rect *bounds, struct nk_context *ctx,
style = &ctx->style;
layout = win->layout;
state = nk_widget(bounds, ctx);
panel_padding = nk_panel_get_padding(style, layout->type);
if (layout->row.index == 1) {
bounds->w += panel_padding.x;
bounds->x -= panel_padding.x;
} else bounds->x -= item_padding.x;
if (layout->row.index == layout->row.columns)
bounds->w += panel_padding.x;
else bounds->w += item_padding.x;
return state;
}
NK_API void