TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed minor scrollbar and panel padding bug

Browse Source 
Fixed scrollbar auto hiding behavior to also work correctly if
the window is not hovered or manipulated in any way.
In addition I fixed a small panel padding bug in `nk_layout_widget`
for all panels outside windows which require a test on
`layout->flags` instead of `window->flags`.
This commit is contained in:
vurtun 2016-08-08 12:08:51 +02:00
parent a0870bd307
commit 2e66a94de9
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nuklear.h
View File

@ -1,5 +1,5 @@
/* /*
Nuklear - v1.052 - public domain Nuklear - v1.054 - public domain
no warrenty implied; use at your own risk. no warrenty implied; use at your own risk.
authored from 2015-2016 by Micha Mettke authored from 2015-2016 by Micha Mettke
@ -100,7 +100,7 @@ OPTIONAL DEFINES:
NK_INCLUDE_FONT_BAKING NK_INCLUDE_FONT_BAKING
Defining this adds the `stb_truetype` and `stb_rect_pack` implementation Defining this adds the `stb_truetype` and `stb_rect_pack` implementation
to this library and provides a default font for font loading and rendering. to this library and provides font loading and rendering.
If you already have font handling or do not want to use this font handler If you already have font handling or do not want to use this font handler
you don't have to define it. you don't have to define it.
@ -188,6 +188,8 @@ LICENSE:
publish and distribute this file as you see fit. publish and distribute this file as you see fit.
CHANGELOG: CHANGELOG:
- 2016/08/06 (1.054)- Fixed scrollbar auto hiding behavior
- 2016/08/06 (1.053)- Fixed wrong panel padding selection in `nk_laout_widget_space`
- 2016/08/06 (1.052)- Fixed old bug in dynamic immediate mode layout API, calculating - 2016/08/06 (1.052)- Fixed old bug in dynamic immediate mode layout API, calculating
wrong item spacing and panel width. wrong item spacing and panel width.
- 2016/08/06 (1.051)- Hopefully finally fixed combobox popup drawing bug - 2016/08/06 (1.051)- Hopefully finally fixed combobox popup drawing bug
@ -16288,14 +16290,14 @@ nk_panel_end(struct nk_context *ctx)
} }
/* hide scroll if no user input */ /* hide scroll if no user input */
{int has_input = ctx->input.mouse.delta.x || ctx->input.mouse.delta.y || ctx->input.mouse.scroll_delta; if (window->flags & NK_WINDOW_SCROLL_AUTO_HIDE) {
int has_input = ctx->input.mouse.delta.x || ctx->input.mouse.delta.y || ctx->input.mouse.scroll_delta;
int is_window_hovered = nk_window_is_hovered(ctx); int is_window_hovered = nk_window_is_hovered(ctx);
int any_item_active = (ctx->last_widget_state & NK_WIDGET_STATE_MODIFIED); int any_item_active = (ctx->last_widget_state & NK_WIDGET_STATE_MODIFIED);
if (window->flags & NK_WINDOW_SCROLL_AUTO_HIDE) { if ((!has_input && is_window_hovered) || (!is_window_hovered && !any_item_active))
if ((!has_input && is_window_hovered) || (is_window_hovered && !any_item_active))
window->scrollbar_hiding_timer += ctx->delta_time_seconds; window->scrollbar_hiding_timer += ctx->delta_time_seconds;
else window->scrollbar_hiding_timer = 0; else window->scrollbar_hiding_timer = 0;
} else window->scrollbar_hiding_timer = 0;} } else window->scrollbar_hiding_timer = 0;
/* window border */ /* window border */
if (layout->flags & NK_WINDOW_BORDER) if (layout->flags & NK_WINDOW_BORDER)
@ -16910,17 +16912,17 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx,
/* cache some configuration data */ /* cache some configuration data */
spacing = ctx->style.window.spacing; spacing = ctx->style.window.spacing;
if (!(win->flags & NK_WINDOW_SUB)) if (!(layout->flags & NK_WINDOW_SUB))
padding = style->window.padding; padding = style->window.padding;
else if (win->flags & NK_WINDOW_COMBO) else if (layout->flags & NK_WINDOW_COMBO)
padding = style->window.combo_padding; padding = style->window.combo_padding;
else if (win->flags & NK_WINDOW_CONTEXTUAL) else if (layout->flags & NK_WINDOW_CONTEXTUAL)
padding = style->window.contextual_padding; padding = style->window.contextual_padding;
else if (win->flags & NK_WINDOW_MENU) else if (layout->flags & NK_WINDOW_MENU)
padding = style->window.menu_padding; padding = style->window.menu_padding;
else if (win->flags & NK_WINDOW_GROUP) else if (layout->flags & NK_WINDOW_GROUP)
padding = style->window.group_padding; padding = style->window.group_padding;
else if (win->flags & NK_WINDOW_TOOLTIP) else if (layout->flags & NK_WINDOW_TOOLTIP)
padding = style->window.tooltip_padding; padding = style->window.tooltip_padding;
else padding = style->window.popup_padding; else padding = style->window.popup_padding;