v4.0.1

CMakeLists.txt

@@ -2,33 +2,34 @@ cmake_minimum_required(VERSION 3.11)
 project(raylib-nuklear
     DESCRIPTION "raylib-nuklear: Nuklear immediate mode GUI for raylib."
     HOMEPAGE_URL "https://github.com/robloach/raylib-nuklear"
-    VERSION 2.1.2
+    VERSION 4.0.1
     LANGUAGES C
 )
 
 # raylib-nuklear
 add_subdirectory(include)
 
-# raylib
-find_package(raylib QUIET)
-if (NOT raylib_FOUND)
-    set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set(BUILD_GAMES    OFF CACHE BOOL "" FORCE)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/raylib)
-endif()
-
 # Examples
 option(BUILD_RAYLIB_NUKLEAR_EXAMPLES "Build Examples" ON)
 if (BUILD_RAYLIB_NUKLEAR_EXAMPLES)
+    # raylib
+    find_package(raylib QUIET)
+    if (NOT raylib_FOUND)
+        set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+        set(BUILD_GAMES    OFF CACHE BOOL "" FORCE)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/raylib)
+    endif()
     add_subdirectory(examples)
 endif()
 
 # Testing
-include(CTest)
-enable_testing()
-if(BUILD_TESTING AND BUILD_RAYLIB_NUKLEAR_EXAMPLES)
-    set(CTEST_CUSTOM_TESTS_IGNORE
-        pkg-config--static
-    )
-    add_subdirectory(test)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
+    enable_testing()
+    if(BUILD_TESTING AND BUILD_RAYLIB_NUKLEAR_EXAMPLES)
+        set(CTEST_CUSTOM_TESTS_IGNORE
+            pkg-config--static
+        )
+        add_subdirectory(test)
+    endif()
 endif()

README.md

@@ -84,6 +84,8 @@ Rectangle RectangleFromNuklear(struct nk_rect rect);
 nk_rect RectangleToNuklear(Rectangle rect);
 ```
 
+See the [Nuklear API documenation](https://immediate-mode-ui.github.io/Nuklear/doc/nuklear.html) for more how to use Nuklear.
+
 ## Development
 
 ```

examples/raylib-nuklear-example.c

@@ -44,7 +44,7 @@ int main(void)
 
     /* GUI */
     struct nk_colorf bg = ColorToNuklearF(SKYBLUE);
-    struct nk_context *ctx = InitNuklear(0);
+    struct nk_context *ctx = InitNuklear(10);
 
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key

include/raylib-nuklear.h

@@ -211,13 +211,14 @@ InitNuklearContext(struct nk_user_font* userFont)
 NK_API struct nk_context*
 InitNuklear(int fontSize)
 {
+    // User font.
+    struct nk_user_font* userFont = (struct nk_user_font*)MemAlloc(sizeof(struct nk_user_font));
+
     // Use the default font size if desired.
     if (fontSize <= 0) {
         fontSize = RAYLIB_NUKLEAR_DEFAULT_FONTSIZE;
     }
 
-    // User font.
-    struct nk_user_font* userFont = (struct nk_user_font*)MemAlloc(sizeof(struct nk_user_font));
     userFont->height = (float)fontSize;
     userFont->width = nk_raylib_font_get_text_width;
     userFont->userdata = nk_handle_ptr(0);
@@ -237,13 +238,13 @@ InitNuklear(int fontSize)
 NK_API struct nk_context*
 InitNuklearEx(Font font, float fontSize)
 {
+    // Copy the font to a new raylib font pointer.
+    struct Font* newFont = (struct Font*)MemAlloc(sizeof(struct Font));
+
     // Use the default font size if desired.
     if (fontSize <= 0.0f) {
         fontSize = (float)RAYLIB_NUKLEAR_DEFAULT_FONTSIZE;
     }
-
-    // Copy the font to a new raylib font pointer.
-    struct Font* newFont = (struct Font*)MemAlloc(sizeof(struct Font));
     newFont->baseSize = font.baseSize;
     newFont->glyphCount = font.glyphCount;
     newFont->glyphPadding = font.glyphPadding;
@@ -665,13 +666,15 @@ UpdateNuklear(struct nk_context * ctx)
 NK_API void
 UnloadNuklear(struct nk_context * ctx)
 {
+    struct nk_user_font* userFont;
+
     // Skip unloading if it's not set.
     if (ctx == NULL) {
         return;
     }
 
     // Unload the font.
-    struct nk_user_font* userFont = (struct nk_user_font*)ctx->style.font;
+    userFont = (struct nk_user_font*)ctx->style.font;
     if (userFont != NULL) {
         // Clear the raylib Font object.
         void* fontPtr = userFont->userdata.ptr;