Merge pull request #387 from Immediate-Mode-UI/revert-156-fix-layout-bounds-padding
Revert "Fix layout bounds not accounting for padding"
This commit is contained in:
commit
3e91905e82
|
@ -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"],
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue