Merge commit 'a16877b5b8b739cb8d43a0a32009265cdd3d4709'

5 files changed, 16 insertions, 11 deletions

diff --git a/nuklear/CHANGELOG.md b/nuklear/CHANGELOG.md
index 96e486e..229fbda 100644
--- a/nuklear/CHANGELOG.md
+++ b/nuklear/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
-- 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/demo/d3d11/nuklear_d3d11.h b/nuklear/demo/d3d11/nuklear_d3d11.h
index 68b067f..efddf0d 100644
--- a/nuklear/demo/d3d11/nuklear_d3d11.h
+++ b/nuklear/demo/d3d11/nuklear_d3d11.h
@@ -205,7 +205,7 @@ nk_d3d11_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
     case WM_SYSKEYDOWN:
     case WM_SYSKEYUP:
     {
-        int down = (lparam >> 31) & 1;
+        int down = !((lparam >> 31) & 1);
         int ctrl = GetKeyState(VK_CONTROL) & (1 << 15);
 
         switch (wparam)
diff --git a/nuklear/demo/gdi/nuklear_gdi.h b/nuklear/demo/gdi/nuklear_gdi.h
index e2792e4..6d3a84a 100644
--- a/nuklear/demo/gdi/nuklear_gdi.h
+++ b/nuklear/demo/gdi/nuklear_gdi.h
@@ -516,7 +516,7 @@ nk_gdi_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
     case WM_SYSKEYDOWN:
     case WM_SYSKEYUP:
     {
-        int down = (lparam >> 31) & 1;
+        int down = !((lparam >> 31) & 1);
         int ctrl = GetKeyState(VK_CONTROL) & (1 << 15);
 
         switch (wparam)
diff --git a/nuklear/demo/gdip/nuklear_gdip.h b/nuklear/demo/gdip/nuklear_gdip.h
index 592887a..66ccc0d 100644
--- a/nuklear/demo/gdip/nuklear_gdip.h
+++ b/nuklear/demo/gdip/nuklear_gdip.h
@@ -754,7 +754,7 @@ nk_gdip_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
     case WM_SYSKEYDOWN:
     case WM_SYSKEYUP:
     {
-        int down = (lparam >> 31) & 1;
+        int down = !((lparam >> 31) & 1);
         int ctrl = GetKeyState(VK_CONTROL) & (1 << 15);
 
         switch (wparam)
diff --git a/nuklear/nuklear.h b/nuklear/nuklear.h
index 09ea7f7..c37e328 100644
--- a/nuklear/nuklear.h
+++ b/nuklear/nuklear.h
@@ -15646,6 +15646,7 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
     win->background = table[NK_COLOR_WINDOW];
     win->fixed_background = nk_style_item_color(table[NK_COLOR_WINDOW]);
     win->border_color = table[NK_COLOR_BORDER];
+    win->popup_border_color = table[NK_COLOR_BORDER];
     win->combo_border_color = table[NK_COLOR_BORDER];
     win->contextual_border_color = table[NK_COLOR_BORDER];
     win->menu_border_color = table[NK_COLOR_BORDER];
@@ -15663,6 +15664,7 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
     win->menu_border = 1.0f;
     win->group_border = 1.0f;
     win->tooltip_border = 1.0f;
+    win->popup_border = 1.0f;
     win->border = 2.0f;
 
     win->padding = nk_vec2(4,4);
@@ -16497,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;
             }
         }
 
@@ -16898,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;
@@ -20427,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);
@@ -20746,8 +20748,8 @@ nk_tooltip_end(struct nk_context *ctx)
 {
     NK_ASSERT(ctx);
     NK_ASSERT(ctx->current);
-    if (!ctx || !ctx->current)
-        return;
+    if (!ctx || !ctx->current) return;
+    ctx->current->seq--;
     nk_popup_close(ctx);
     nk_popup_end(ctx);
 }
@@ -20978,14 +20980,14 @@ nk_contextual_end(struct nk_context *ctx)
     if (panel->flags & NK_WINDOW_DYNAMIC) {
         /* Close behavior
         This is a bit hack solution since we do not now before we end our popup
-        how big it will be. We therefore do not directly now when a
+        how big it will be. We therefore do not directly know when a
         click outside the non-blocking popup must close it at that direct frame.
         Instead it will be closed in the next frame.*/
         struct nk_rect body = {0,0,0,0};
         if (panel->at_y < (panel->bounds.y + panel->bounds.h)) {
             struct nk_vec2 padding = nk_panel_get_padding(&ctx->style, panel->type);
             body = panel->bounds;
-            body.y = (panel->at_y + panel->footer_height + panel->border + padding.y);
+            body.y = (panel->at_y + panel->footer_height + panel->border + padding.y + panel->row.height);
             body.h = (panel->bounds.y + panel->bounds.h) - body.y;
         }