diff --git a/CHANGELOG.md b/CHANGELOG.md index 86f1895..1c73e87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,4 @@ # Changelog - - 2016/09/13 (1.15) - !BREAKING! Fixed nonblocking popup behavior in menu, combo, and contextual which prevented closing in y-direction if popup did not reach max height. diff --git a/demo/d3d11/main.c b/demo/d3d11/main.c index dc0c165..63c3c8a 100644 --- a/demo/d3d11/main.c +++ b/demo/d3d11/main.c @@ -231,7 +231,7 @@ int main(void) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/glfw_opengl2/main.c b/demo/glfw_opengl2/main.c index cfa1e8e..f5ea3b0 100644 --- a/demo/glfw_opengl2/main.c +++ b/demo/glfw_opengl2/main.c @@ -127,7 +127,7 @@ int main(void) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/glfw_opengl3/main.c b/demo/glfw_opengl3/main.c index e92aaf9..2ebe15d 100644 --- a/demo/glfw_opengl3/main.c +++ b/demo/glfw_opengl3/main.c @@ -141,7 +141,7 @@ int main(void) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index 050acd2..dfdfe87 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -138,7 +138,7 @@ main(int argc, char* argv[]) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/sdl_opengl3/main.c b/demo/sdl_opengl3/main.c index dda147f..b686c9a 100644 --- a/demo/sdl_opengl3/main.c +++ b/demo/sdl_opengl3/main.c @@ -146,7 +146,7 @@ main(int argc, char* argv[]) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/x11_opengl2/main.c b/demo/x11_opengl2/main.c index 8534a45..2a19d0c 100644 --- a/demo/x11_opengl2/main.c +++ b/demo/x11_opengl2/main.c @@ -274,7 +274,7 @@ int main(int argc, char **argv) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1); diff --git a/demo/x11_opengl3/main.c b/demo/x11_opengl3/main.c index e85884b..7297b3a 100644 --- a/demo/x11_opengl3/main.c +++ b/demo/x11_opengl3/main.c @@ -271,7 +271,7 @@ int main(int argc, char **argv) nk_layout_row_dynamic(ctx, 20, 1); nk_label(ctx, "background:", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 1); - if (nk_combo_begin_color(ctx, &combo, background, 400)) { + if (nk_combo_begin_color(ctx, &combo, background, nk_vec2(nk_widget_width(ctx),400))) { nk_layout_row_dynamic(ctx, 120, 1); background = nk_color_picker(ctx, background, NK_RGBA); nk_layout_row_dynamic(ctx, 25, 1);