diff --git a/clib.json b/clib.json index f44cdd46e..88e8d411e 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.9.4", + "version": "4.9.5", "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 523600dc4..6699d61d2 100644 --- a/nuklear.h +++ b/nuklear.h @@ -19547,8 +19547,6 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; - layout->bounds.y += panel_padding.y; - layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border); @@ -29626,8 +29624,9 @@ 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 /// +/// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized -/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. +/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/CHANGELOG b/src/CHANGELOG index 93ca031e8..bbd956ffa 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,8 +7,9 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized -/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. +/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/nuklear_panel.c b/src/nuklear_panel.c index 3e204d1f4..f170d7ccc 100644 --- a/src/nuklear_panel.c +++ b/src/nuklear_panel.c @@ -156,8 +156,6 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; - layout->bounds.y += panel_padding.y; - layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border);