v 4.10.0: Multiple PRs merged

Readme.md

@@ -59,37 +59,55 @@ This is very important; not doing it either leads to compiler errors, or even wo
 struct nk_context ctx;
 nk_init_fixed(&ctx, calloc(1, MAX_MEMORY), MAX_MEMORY, &font);
 
-enum {EASY, HARD};
-static int op = EASY;
+enum { EASY, NORMAL, HARD };
+static int op = EASY, active[3]{ 1, 0, 1 }, selected{};
 static float value = 0.6f;
 static int i =  20;
-
-if (nk_begin(&ctx, "Show", nk_rect(50, 50, 220, 220),
-    NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_CLOSABLE)) {
-    /* fixed widget pixel width */
-    nk_layout_row_static(&ctx, 30, 80, 1);
-    if (nk_button_label(&ctx, "button")) {
-        /* event handling */
-    }
-
-    /* fixed widget window ratio width */
-    nk_layout_row_dynamic(&ctx, 30, 2);
-    if (nk_option_label(&ctx, "easy", op == EASY)) op = EASY;
-    if (nk_option_label(&ctx, "hard", op == HARD)) op = HARD;
-
-    /* custom widget pixel width */
-    nk_layout_row_begin(&ctx, NK_STATIC, 30, 2);
-    {
-        nk_layout_row_push(&ctx, 50);
-        nk_label(&ctx, "Volume:", NK_TEXT_LEFT);
-        nk_layout_row_push(&ctx, 110);
-        nk_slider_float(&ctx, 0, &value, 1.0f, 0.1f);
-    }
-    nk_layout_row_end(&ctx);
+static size_t test{};
+
+static char const * biomes[] = {
+	"Large biome",
+	"Small biome"
+};
+
+static int biomeCount = int(sizeof(biomes) / sizeof(biomes[0]));
+
+if (nk_begin(&ctx, "Show", nk_rect(50, 50, 300, 350),
+             NK_WINDOW_BORDER|NK_WINDOW_SCALABLE|NK_WINDOW_MOVABLE|NK_WINDOW_TITLE)) {
+
+	// fixed widget pixel width
+	nk_layout_row_static(&ctx, 30, 150, 1);
+	if (nk_button_label(&ctx, "Play"))
+		myPlayFunction();
+
+	// fixed widget window ratio width
+	nk_layout_row_dynamic(&ctx, 30, 2);
+	if (nk_option_label(&ctx, "Easy", op == EASY)) op = EASY;
+	if (nk_option_label(&ctx, "Normal", op == NORMAL)) op = NORMAL;
+	if (nk_option_label(&ctx, "Hard", op == HARD)) op = HARD;
+
+	nk_layout_row_dynamic(ctx, 30, 2);
+	nk_checkbox_label(&ctx, "Silver", active);
+	nk_checkbox_label(&ctx, "Bronze", active + 1);
+	nk_checkbox_label(&ctx, "Gold", active + 2);
+
+	nk_layout_row_dynamic(&ctx, 30, 2);
+	nk_combobox(&ctx, names, biome_count, &selected, 30, nk_vec2(150, 200));
+
+	// custom widget pixel width
+	nk_layout_row_begin(&ctx, NK_STATIC, 30, 2);
+	{
+		nk_layout_row_push(&ctx, 50);
+		nk_label(&ctx, "Volume:", NK_TEXT_LEFT);
+		nk_layout_row_push(&ctx, 110);
+		nk_slider_float(&ctx, 0, &value, 1.0f, 0.1f);
+		nk_progress(&ctx, &test, 100, 1);
+	}
+	nk_layout_row_end(&ctx);
 }
 nk_end(&ctx);
 ```
-![example](https://cloud.githubusercontent.com/assets/8057201/10187981/584ecd68-675c-11e5-897c-822ef534a876.png)
+![example](img/test%20window.png)
 
 ## Bindings
 There are a number of nuklear bindings for different languages created by other authors.

clib.json

@@ -1,8 +1,14 @@
 {
   "name": "nuklear",
-  "version": "4.09.0",
+  "version": "4.10.0",
   "repo": "Immediate-Mode-UI/Nuklear",
   "description": "A small ANSI C gui toolkit",
-  "keywords": ["gl", "ui", "toolkit"],
-  "src": ["nuklear.h"]
+  "keywords": [
+    "gl",
+    "ui",
+    "toolkit"
+  ],
+  "src": [
+    "nuklear.h"
+  ]
 }

doc/nuklear.html

@@ -1,4 +1,4 @@
-<meta charset='utf-8' emacsmode='-*- markdown -*-'>
+<meta charset='utf-8' emacsmode='-*- markdown -*-'>
 <link rel='stylesheet' href='https://casual-effects.com/markdeep/latest/apidoc.css?'>
 <title>Nuklear</title>      <!--Page Title-->
 # Nuklear
@@ -137,6 +137,7 @@
 NK_COS      | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation.
 NK_STRTOD   | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!).
 NK_DTOA     | You can define this to `dtoa` or your own double to string conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!).
+NK_ERROR    | Defined to NK_ASSERT(0 && ...), when an assert always returns false. This is done to allow strict C++17 implementations to keep on working.
 NK_VSNPRINTF| If you define `NK_INCLUDE_STANDARD_VARARGS` as well as `NK_INCLUDE_STANDARD_IO` and want to be safe define this to `vsnprintf` on compilers supporting later versions of C or C++. By default nuklear will check for your stdlib version in C as well as compiler version in C++. if `vsnprintf` is available it will define it to `vsnprintf` directly. If not defined and if you have older versions of C or C++ it will be defined to `vsprintf` which is unsafe.
 !!! WARNING
     The following dependencies will pull in the standard C library if not redefined:
@@ -2313,6 +2314,17 @@
    - [x]: Major version with API and library breaking changes
    - [yy]: Minor version with non-breaking API and library changes
    - [zz]: Bug fix version with no direct changes to API
+- 2020/07/06 (4.04.0) - Added subpixel API from itsuhane. Allowing you to turn on 
+                        NK_ENABLE_SUBPIXEL_API to position window and elements in subpixels
+                        Changed nk_begin to return a nk_window so you can get the position and other useful info.
+                        Fixed radio buttons' style.
+                        Fixed click cascading through multiple buttons; it should only click the upper button.
+                        Strict c++17 now compiles: only declaring memset, memcpy if they are used.
+                        Only asserting index range if ushorts are used for indices.
+                        Made paq.sh identical to paq.bat (outputs to nuklear.h).
+                        Replaced NK_ASSERT(0 && ...) with NK_ERROR(), to ensure it compiles on strict C++17.
+                        Replaced const char** by const char * const * in combobox, to ensure const List&lt;const char*&gt; can be used.
+                        Added nk_tree_type for allowing the symbol next to a tree element to be hidden (for children) if it's not an image.
 - 2020/04/09 (4.02.1) - Removed unused nk_sqrt function to fix compiler warnings
                       - Fixed compiler warnings if you bring your own methods for
                        nk_cos/nk_sin/nk_strtod/nk_memset/nk_memcopy/nk_dtoa