diff options
| author | Andre Weissflog <floooh@gmail.com> | 2024-10-24 19:01:43 +0200 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2024-10-24 19:01:43 +0200 |
| commit | 648961074400828d637f2415598ac09991d305c4 (patch) | |
| tree | f9f7d24d74b3846cced9b9c5b2ddbf2212961df9 | |
| parent | c25638026fc2fa23331ceae10cff056048b57db6 (diff) | |
| parent | 01fafee8487d8441f69be802407799d7ac37efc0 (diff) | |
Merge branch 'dlannan-nuklear_add_cursors'
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | util/sokol_nuklear.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 86b14c4a..29af32ee 100644 --- 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 index 06229f71..a598b59d 100644 --- 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]); } } |