aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvurtun <polygone@gmx.net>2016-11-22 11:56:58 +0100
committervurtun <polygone@gmx.net>2016-11-22 18:16:26 +0100
commita16877b5b8b739cb8d43a0a32009265cdd3d4709 (patch)
tree52683dd3d8fa421931e25175e60724c912f66273
parent67ad444adfd86224c256d58834065c87d43b60bc (diff)
downloadsherlock.lv2-a16877b5b8b739cb8d43a0a32009265cdd3d4709.tar.xz
Fixed minimized window closing bug #266
-rw-r--r--CHANGELOG.md9
-rw-r--r--nuklear.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcc8801..229fbda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
# Changelog
-- 2016/11/10 (1.184)- Fixed abstract combo box closing behavior
-- 2016/11/10 (1.184)- Fixed tooltip flickering
-- 2016/11/10 (1.183)- Fixed memory leak caused by popup repeated closing
-- 2016/11/10 (1.182)- Fixed memory leak caused by popup panel allocation
+- 2016/11/22 (1.184)- Fixed window minimized closing bug
+- 2016/11/19 (1.184)- Fixed abstract combo box closing behavior
+- 2016/11/19 (1.184)- Fixed tooltip flickering
+- 2016/11/19 (1.183)- Fixed memory leak caused by popup repeated closing
+- 2016/11/18 (1.182)- Fixed memory leak caused by popup panel allocation
- 2016/11/10 (1.181)- Fixed some warnings and C++ error
- 2016/11/10 (1.180)- Added additional `nk_button` versions which allows to directly
pass in a style struct to change buttons visual.
diff --git a/nuklear.h b/nuklear.h
index d106a3e..c37e328 100644
--- a/nuklear.h
+++ b/nuklear.h
@@ -16499,6 +16499,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan
{
layout->flags |= NK_WINDOW_HIDDEN;
layout->flags |= NK_WINDOW_CLOSED;
+ layout->flags &= ~NK_WINDOW_MINIMIZED;
}
}
@@ -16900,7 +16901,7 @@ nk_link_page_element_into_freelist(struct nk_context *ctx,
NK_INTERN void
nk_free_page_element(struct nk_context *ctx, struct nk_page_element *elem)
{
- /* fixed size pool so just add to free list */
+ /* we have a pool so just add to free list */
if (ctx->use_pool) {
nk_link_page_element_into_freelist(ctx, elem);
return;
@@ -20429,7 +20430,6 @@ nk_list_view_begin(struct nk_context *ctx, struct nk_list_view *view,
if (!ctx || !view || !title) return 0;
win = ctx->current;
- layout = win->layout;
style = &ctx->style;
item_spacing = style->window.spacing;
row_height += NK_MAX(0, (int)item_spacing.y);