Merge branch 'dlannan-nuklear_add_cursors'

floooh · Oct 24, 2024 · 6489610 · 6489610
2 parents c256380 + 01fafee
commit 6489610
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Updates
 
+### 24-Oct-2024
+
+- sokol_nuklear.h: Merged https://github.com/floooh/sokol/pull/1138 which
+  allows to use Nuklear's software mouse cursors. Many thanks to @dlannan!
+
 ### 22-Oct-2024
 
 - sokol_imgui.h: Fixed for latest Dear ImGui version 1.91.4 (Dear ImGui has

diff --git a/util/sokol_nuklear.h b/util/sokol_nuklear.h
@@ -2152,6 +2152,8 @@ SOKOL_API_IMPL void snk_setup(const snk_desc_t* desc) {
         nk_font_atlas_cleanup(&_snuklear.atlas);
         if (_snuklear.atlas.default_font) {
             nk_style_set_font(&_snuklear.ctx, &_snuklear.atlas.default_font->handle);
+            // This adds the default cursors into the nuklear overlay for use.
+            nk_style_load_all_cursors(&_snuklear.ctx, &_snuklear.atlas.cursors[0]);
         }
     }