Skip to content
Snippets Groups Projects
Commit 5f8431d7 authored by Camilla Löwy's avatar Camilla Löwy
Browse files

Update Nuklear to 2.00.4

parent 0ee9a03b
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
deps/nuklear.h
+ 462
− 335
View file @ 5f8431d7
/* /*
Nuklear - 1.40.0 - public domain Nuklear - 2.00.4 - public domain
no warrenty implied; use at your own risk. no warranty implied; use at your own risk.
authored from 2015-2017 by Micha Mettke authored from 2015-2017 by Micha Mettke
   
ABOUT: ABOUT:
...@@ -17,7 +17,7 @@ VALUES: ...@@ -17,7 +17,7 @@ VALUES:
- Graphical user interface toolkit - Graphical user interface toolkit
- Single header library - Single header library
- Written in C89 (a.k.a. ANSI C or ISO C90) - Written in C89 (a.k.a. ANSI C or ISO C90)
- Small codebase (~17kLOC) - Small codebase (~18kLOC)
- Focus on portability, efficiency and simplicity - Focus on portability, efficiency and simplicity
- No dependencies (not even the standard library if not wanted) - No dependencies (not even the standard library if not wanted)
- Fully skinnable and customizable - Fully skinnable and customizable
...@@ -47,7 +47,7 @@ USAGE: ...@@ -47,7 +47,7 @@ USAGE:
or even worse stack corruptions. or even worse stack corruptions.
   
FEATURES: FEATURES:
- Absolutely no platform dependend code - Absolutely no platform dependent code
- Memory management control ranging from/to - Memory management control ranging from/to
- Ease of use by allocating everything from standard library - Ease of use by allocating everything from standard library
- Control every byte of memory inside the library - Control every byte of memory inside the library
...@@ -128,7 +128,7 @@ OPTIONAL DEFINES: ...@@ -128,7 +128,7 @@ OPTIONAL DEFINES:
<!> If used needs to be defined for implementation and header <!> <!> If used needs to be defined for implementation and header <!>
   
NK_BUTTON_TRIGGER_ON_RELEASE NK_BUTTON_TRIGGER_ON_RELEASE
Different platforms require button clicks occuring either on buttons being Different platforms require button clicks occurring either on buttons being
pressed (up to down) or released (down to up). pressed (up to down) or released (down to up).
By default this library will react on buttons being pressed, but if you By default this library will react on buttons being pressed, but if you
define this it will only trigger if a button is released. define this it will only trigger if a button is released.
...@@ -516,7 +516,7 @@ enum nk_symbol_type { ...@@ -516,7 +516,7 @@ enum nk_symbol_type {
* To use a context it first has to be initialized which can be achieved by calling * To use a context it first has to be initialized which can be achieved by calling
* one of either `nk_init_default`, `nk_init_fixed`, `nk_init`, `nk_init_custom`. * one of either `nk_init_default`, `nk_init_fixed`, `nk_init`, `nk_init_custom`.
* Each takes in a font handle and a specific way of handling memory. Memory control * Each takes in a font handle and a specific way of handling memory. Memory control
* hereby ranges from standard library to just specifing a fixed sized block of memory * hereby ranges from standard library to just specifying a fixed sized block of memory
* which nuklear has to manage itself from. * which nuklear has to manage itself from.
* *
* struct nk_context ctx; * struct nk_context ctx;
...@@ -529,7 +529,7 @@ enum nk_symbol_type { ...@@ -529,7 +529,7 @@ enum nk_symbol_type {
* *
* Reference * Reference
* ------------------- * -------------------
* nk_init_default - Initializes context with standard library memory alloction (malloc,free) * nk_init_default - Initializes context with standard library memory allocation (malloc,free)
* nk_init_fixed - Initializes context from single fixed size memory block * nk_init_fixed - Initializes context from single fixed size memory block
* nk_init - Initializes context with memory allocator callbacks for alloc and free * nk_init - Initializes context with memory allocator callbacks for alloc and free
* nk_init_custom - Initializes context from two buffers. One for draw commands the other for window/panel/table allocations * nk_init_custom - Initializes context from two buffers. One for draw commands the other for window/panel/table allocations
...@@ -549,10 +549,10 @@ enum nk_symbol_type { ...@@ -549,10 +549,10 @@ enum nk_symbol_type {
NK_API int nk_init_default(struct nk_context*, const struct nk_user_font*); NK_API int nk_init_default(struct nk_context*, const struct nk_user_font*);
#endif #endif
/* nk_init_fixed - Initializes a `nk_context` struct from a single fixed size memory block /* nk_init_fixed - Initializes a `nk_context` struct from a single fixed size memory block
* Should be used if you want complete control over nuklears memory management. * Should be used if you want complete control over nuklear's memory management.
* Especially recommended for system with little memory or systems with virtual memory. * Especially recommended for system with little memory or systems with virtual memory.
* For the later case you can just allocate for example 16MB of virtual memory * For the later case you can just allocate for example 16MB of virtual memory
* and only the required amount of memory will actually be commited. * and only the required amount of memory will actually be committed.
* IMPORTANT: make sure the passed memory block is aligned correctly for `nk_draw_commands` * IMPORTANT: make sure the passed memory block is aligned correctly for `nk_draw_commands`
* Parameters: * Parameters:
* @ctx must point to an either stack or heap allocated `nk_context` struct * @ctx must point to an either stack or heap allocated `nk_context` struct
...@@ -700,37 +700,36 @@ enum nk_buttons { ...@@ -700,37 +700,36 @@ enum nk_buttons {
NK_BUTTON_MAX NK_BUTTON_MAX
}; };
/* nk_input_begin - Begins the input mirroring process by resetting text, scroll /* nk_input_begin - Begins the input mirroring process by resetting text, scroll
* mouse previous mouse position and movement as well as key state transistions, * mouse previous mouse position and movement as well as key state transitions,
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct */ * @ctx must point to an previously initialized `nk_context` struct */
NK_API void nk_input_begin(struct nk_context*); NK_API void nk_input_begin(struct nk_context*);
/* nk_input_motion - Mirros current mouse position to nuklear /* nk_input_motion - Mirrors current mouse position to nuklear
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @x must constain an integer describing the current mouse cursor x-position * @x must contain an integer describing the current mouse cursor x-position
* @y must constain an integer describing the current mouse cursor y-position */ * @y must contain an integer describing the current mouse cursor y-position */
NK_API void nk_input_motion(struct nk_context*, int x, int y); NK_API void nk_input_motion(struct nk_context*, int x, int y);
/* nk_input_key - Mirros state of a specific key to nuklear /* nk_input_key - Mirrors state of a specific key to nuklear
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @key must be any value specified in enum `nk_keys` that needs to be mirrored * @key must be any value specified in enum `nk_keys` that needs to be mirrored
* @down must be 0 for key is up and 1 for key is down */ * @down must be 0 for key is up and 1 for key is down */
NK_API void nk_input_key(struct nk_context*, enum nk_keys, int down); NK_API void nk_input_key(struct nk_context*, enum nk_keys, int down);
/* nk_input_button - Mirros the state of a specific mouse button to nuklear /* nk_input_button - Mirrors the state of a specific mouse button to nuklear
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @nk_buttons must be any value specified in enum `nk_buttons` that needs to be mirrored * @nk_buttons must be any value specified in enum `nk_buttons` that needs to be mirrored
* @x must constain an integer describing mouse cursor x-position on click up/down * @x must contain an integer describing mouse cursor x-position on click up/down
* @y must constain an integer describing mouse cursor y-position on click up/down * @y must contain an integer describing mouse cursor y-position on click up/down
* @down must be 0 for key is up and 1 for key is down */ * @down must be 0 for key is up and 1 for key is down */
NK_API void nk_input_button(struct nk_context*, enum nk_buttons, int x, int y, int down); NK_API void nk_input_button(struct nk_context*, enum nk_buttons, int x, int y, int down);
/* nk_input_char - Copies a single ASCII character into an internal text buffer /* nk_input_scroll - Copies the last mouse scroll value to nuklear. Is generally
* This is basically a helper function to quickly push ASCII characters into * a scroll value. So does not have to come from mouse and could also originate
* nuklear. Note that you can only push up to NK_INPUT_MAX bytes into * from touch for example.
* struct `nk_input` between `nk_input_begin` and `nk_input_end`.
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @c must be a single ASCII character preferable one that can be printed */ * @val vector with both X- as well as Y-scroll value */
NK_API void nk_input_scroll(struct nk_context*, struct nk_vec2 val); NK_API void nk_input_scroll(struct nk_context*, struct nk_vec2 val);
/* nk_input_char - Copies a single ASCII character into an internal text buffer /* nk_input_char - Copies a single ASCII character into an internal text buffer
* This is basically a helper function to quickly push ASCII characters into * This is basically a helper function to quickly push ASCII characters into
...@@ -746,7 +745,7 @@ NK_API void nk_input_char(struct nk_context*, char); ...@@ -746,7 +745,7 @@ NK_API void nk_input_char(struct nk_context*, char);
* struct `nk_input` between `nk_input_begin` and `nk_input_end`. * struct `nk_input` between `nk_input_begin` and `nk_input_end`.
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @glyph UTF-32 uncode codepoint */ * @glyph UTF-32 unicode codepoint */
NK_API void nk_input_glyph(struct nk_context*, const nk_glyph); NK_API void nk_input_glyph(struct nk_context*, const nk_glyph);
/* nk_input_unicode - Converts a unicode rune into UTF-8 and copies the result /* nk_input_unicode - Converts a unicode rune into UTF-8 and copies the result
* into an internal text buffer. * into an internal text buffer.
...@@ -754,7 +753,7 @@ NK_API void nk_input_glyph(struct nk_context*, const nk_glyph); ...@@ -754,7 +753,7 @@ NK_API void nk_input_glyph(struct nk_context*, const nk_glyph);
* struct `nk_input` between `nk_input_begin` and `nk_input_end`. * struct `nk_input` between `nk_input_begin` and `nk_input_end`.
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @glyph UTF-32 uncode codepoint */ * @glyph UTF-32 unicode codepoint */
NK_API void nk_input_unicode(struct nk_context*, nk_rune); NK_API void nk_input_unicode(struct nk_context*, nk_rune);
/* nk_input_end - End the input mirroring process by resetting mouse grabbing /* nk_input_end - End the input mirroring process by resetting mouse grabbing
* state to ensure the mouse cursor is not grabbed indefinitely. * state to ensure the mouse cursor is not grabbed indefinitely.
...@@ -872,7 +871,7 @@ NK_API void nk_input_end(struct nk_context*); ...@@ -872,7 +871,7 @@ NK_API void nk_input_end(struct nk_context*);
* nk_free(&ctx); * nk_free(&ctx);
* *
* The second probably more applicable trick is to only draw if anything changed. * The second probably more applicable trick is to only draw if anything changed.
* It is not really useful for applications with continous draw loop but * It is not really useful for applications with continuous draw loop but
* quite useful for desktop applications. To actually get nuklear to only * quite useful for desktop applications. To actually get nuklear to only
* draw on changes you first have to define `NK_ZERO_COMMAND_MEMORY` and * draw on changes you first have to define `NK_ZERO_COMMAND_MEMORY` and
* allocate a memory buffer that will store each unique drawing output. * allocate a memory buffer that will store each unique drawing output.
...@@ -920,7 +919,7 @@ NK_API void nk_input_end(struct nk_context*); ...@@ -920,7 +919,7 @@ NK_API void nk_input_end(struct nk_context*);
* hardware directly. Therefore it is possible to just define * hardware directly. Therefore it is possible to just define
* `NK_INCLUDE_VERTEX_BUFFER_OUTPUT` which includes optional vertex output. * `NK_INCLUDE_VERTEX_BUFFER_OUTPUT` which includes optional vertex output.
* To access the vertex output you first have to convert all draw commands into * To access the vertex output you first have to convert all draw commands into
* vertexes by calling `nk_convert` which takes in your prefered vertex format. * vertexes by calling `nk_convert` which takes in your preferred vertex format.
* After successfully converting all draw commands just iterate over and execute all * After successfully converting all draw commands just iterate over and execute all
* vertex draw commands: * vertex draw commands:
* *
...@@ -959,9 +958,9 @@ NK_API void nk_input_end(struct nk_context*); ...@@ -959,9 +958,9 @@ NK_API void nk_input_end(struct nk_context*);
* ------------------- * -------------------
* nk__begin - Returns the first draw command in the context draw command list to be drawn * nk__begin - Returns the first draw command in the context draw command list to be drawn
* nk__next - Increments the draw command iterator to the next command inside the context draw command list * nk__next - Increments the draw command iterator to the next command inside the context draw command list
* nk_foreach - Iteratates over each draw command inside the context draw command list * nk_foreach - Iterates over each draw command inside the context draw command list
* *
* nk_convert - Converts from the abstract draw commands list into a hardware accessable vertex format * nk_convert - Converts from the abstract draw commands list into a hardware accessible vertex format
* nk__draw_begin - Returns the first vertex command in the context vertex draw list to be executed * nk__draw_begin - Returns the first vertex command in the context vertex draw list to be executed
* nk__draw_next - Increments the vertex command iterator to the next command inside the context vertex command list * nk__draw_next - Increments the vertex command iterator to the next command inside the context vertex command list
* nk__draw_end - Returns the end of the vertex draw list * nk__draw_end - Returns the end of the vertex draw list
...@@ -989,7 +988,7 @@ struct nk_convert_config { ...@@ -989,7 +988,7 @@ struct nk_convert_config {
struct nk_draw_null_texture null; /* handle to texture with a white pixel for shape drawing */ struct nk_draw_null_texture null; /* handle to texture with a white pixel for shape drawing */
const struct nk_draw_vertex_layout_element *vertex_layout; /* describes the vertex output format and packing */ const struct nk_draw_vertex_layout_element *vertex_layout; /* describes the vertex output format and packing */
nk_size vertex_size; /* sizeof one vertex for vertex packing */ nk_size vertex_size; /* sizeof one vertex for vertex packing */
nk_size vertex_alignment; /* vertex alignment: Can be optained by NK_ALIGNOF */ nk_size vertex_alignment; /* vertex alignment: Can be obtained by NK_ALIGNOF */
}; };
/* nk__begin - Returns a draw command list iterator to iterate all draw /* nk__begin - Returns a draw command list iterator to iterate all draw
* commands accumulated over one frame. * commands accumulated over one frame.
...@@ -1012,14 +1011,14 @@ NK_API const struct nk_command* nk__next(struct nk_context*, const struct nk_com ...@@ -1012,14 +1011,14 @@ NK_API const struct nk_command* nk__next(struct nk_context*, const struct nk_com
#define nk_foreach(c, ctx) for((c) = nk__begin(ctx); (c) != 0; (c) = nk__next(ctx,c)) #define nk_foreach(c, ctx) for((c) = nk__begin(ctx); (c) != 0; (c) = nk__next(ctx,c))
#ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT #ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT
/* nk_convert - converts all internal draw command into vertex draw commands and fills /* nk_convert - converts all internal draw command into vertex draw commands and fills
* three buffers with vertexes, vertex draw commands and vertex indicies. The vertex format * three buffers with vertexes, vertex draw commands and vertex indices. The vertex format
* as well as some other configuration values have to be configurated by filling out a * as well as some other configuration values have to be configured by filling out a
* `nk_convert_config` struct. * `nk_convert_config` struct.
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct at the end of a frame * @ctx must point to an previously initialized `nk_context` struct at the end of a frame
* @cmds must point to a previously initialized buffer to hold converted vertex draw commands * @cmds must point to a previously initialized buffer to hold converted vertex draw commands
* @vertices must point to a previously initialized buffer to hold all produced verticies * @vertices must point to a previously initialized buffer to hold all produced vertices
* @elements must point to a previously initialized buffer to hold all procudes vertex indicies * @elements must point to a previously initialized buffer to hold all produced vertex indices
* @config must point to a filled out `nk_config` struct to configure the conversion process * @config must point to a filled out `nk_config` struct to configure the conversion process
* Returns: * Returns:
* returns NK_CONVERT_SUCCESS on success and a enum nk_convert_result error values if not */ * returns NK_CONVERT_SUCCESS on success and a enum nk_convert_result error values if not */
...@@ -1038,7 +1037,7 @@ NK_API const struct nk_draw_command* nk__draw_begin(const struct nk_context*, co ...@@ -1038,7 +1037,7 @@ NK_API const struct nk_draw_command* nk__draw_begin(const struct nk_context*, co
* Return values: * Return values:
* vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer */ * vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer */
NK_API const struct nk_draw_command* nk__draw_end(const struct nk_context*, const struct nk_buffer*); NK_API const struct nk_draw_command* nk__draw_end(const struct nk_context*, const struct nk_buffer*);
/* nk__draw_next - Increments the the vertex draw command buffer iterator /* nk__draw_next - Increments the vertex draw command buffer iterator
* Parameters: * Parameters:
* @cmd must point to an previously either by `nk__draw_begin` or `nk__draw_next` returned vertex draw command * @cmd must point to an previously either by `nk__draw_begin` or `nk__draw_next` returned vertex draw command
* @buf must point to an previously by `nk_convert` filled out vertex draw command buffer * @buf must point to an previously by `nk_convert` filled out vertex draw command buffer
...@@ -1070,7 +1069,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1070,7 +1069,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* order. The topmost window thereby is the currently active window. * order. The topmost window thereby is the currently active window.
* *
* To change window position inside the stack occurs either automatically by * To change window position inside the stack occurs either automatically by
* user input by being clicked on or programatically by calling `nk_window_focus`. * user input by being clicked on or programmatically by calling `nk_window_focus`.
* Windows by default are visible unless explicitly being defined with flag * Windows by default are visible unless explicitly being defined with flag
* `NK_WINDOW_HIDDEN`, the user clicked the close button on windows with flag * `NK_WINDOW_HIDDEN`, the user clicked the close button on windows with flag
* `NK_WINDOW_CLOSABLE` or if a window was explicitly hidden by calling * `NK_WINDOW_CLOSABLE` or if a window was explicitly hidden by calling
...@@ -1082,9 +1081,9 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1082,9 +1081,9 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* functions to start window declarations and `nk_end` at the end. Furthermore it * functions to start window declarations and `nk_end` at the end. Furthermore it
* is recommended to check the return value of `nk_begin_xxx` and only process * is recommended to check the return value of `nk_begin_xxx` and only process
* widgets inside the window if the value is not 0. Either way you have to call * widgets inside the window if the value is not 0. Either way you have to call
* `nk_end` at the end of window declarations. Furthmore do not attempt to * `nk_end` at the end of window declarations. Furthermore, do not attempt to
* nest `nk_begin_xxx` calls which will hopefully result in an assert or if not * nest `nk_begin_xxx` calls which will hopefully result in an assert or if not
* in a segmation fault. * in a segmentation fault.
* *
* if (nk_begin_xxx(...) { * if (nk_begin_xxx(...) {
* [... widgets ...] * [... widgets ...]
...@@ -1094,7 +1093,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1094,7 +1093,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* In the grand concept window and widget declarations need to occur after input * In the grand concept window and widget declarations need to occur after input
* handling and before drawing to screen. Not doing so can result in higher * handling and before drawing to screen. Not doing so can result in higher
* latency or at worst invalid behavior. Furthermore make sure that `nk_clear` * latency or at worst invalid behavior. Furthermore make sure that `nk_clear`
* is called at the end of the frame. While nuklears default platform backends * is called at the end of the frame. While nuklear's default platform backends
* already call `nk_clear` for you if you write your own backend not calling * already call `nk_clear` for you if you write your own backend not calling
* `nk_clear` can cause asserts or even worse undefined behavior. * `nk_clear` can cause asserts or even worse undefined behavior.
* *
...@@ -1135,7 +1134,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1135,7 +1134,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* Reference * Reference
* ------------------- * -------------------
* nk_begin - starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed * nk_begin - starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed
* nk_begin_titled - extended window start with seperated title and identifier to allow multiple windows with same name but not title * nk_begin_titled - extended window start with separated title and identifier to allow multiple windows with same name but not title
* nk_end - needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup * nk_end - needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup
* *
* nk_window_find - finds and returns the window with give name * nk_window_find - finds and returns the window with give name
...@@ -1144,7 +1143,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1144,7 +1143,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* nk_window_get_size - returns the size with width and height of the currently processed window * nk_window_get_size - returns the size with width and height of the currently processed window
* nk_window_get_width - returns the width of the currently processed window * nk_window_get_width - returns the width of the currently processed window
* nk_window_get_height - returns the height of the currently processed window * nk_window_get_height - returns the height of the currently processed window
* nk_window_get_panel - returns the underlying panel which contains all processing state of the currnet window * nk_window_get_panel - returns the underlying panel which contains all processing state of the current window
* nk_window_get_content_region - returns the position and size of the currently visible and non-clipped space inside the currently processed window * nk_window_get_content_region - returns the position and size of the currently visible and non-clipped space inside the currently processed window
* nk_window_get_content_region_min - returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window * nk_window_get_content_region_min - returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window
* nk_window_get_content_region_max - returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window * nk_window_get_content_region_max - returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window
...@@ -1157,7 +1156,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* ...@@ -1157,7 +1156,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
* nk_window_is_hidden - returns if the currently processed window was hidden * nk_window_is_hidden - returns if the currently processed window was hidden
* nk_window_is_active - same as nk_window_has_focus for some reason * nk_window_is_active - same as nk_window_has_focus for some reason
* nk_window_is_hovered - returns if the currently processed window is currently being hovered by mouse * nk_window_is_hovered - returns if the currently processed window is currently being hovered by mouse
* nk_window_is_any_hovered - return if any wndow currently hovered * nk_window_is_any_hovered - return if any window currently hovered
* nk_item_is_any_active - returns if any window or widgets is currently hovered or active * nk_item_is_any_active - returns if any window or widgets is currently hovered or active
* *
* nk_window_set_bounds - updates position and size of the currently processed window * nk_window_set_bounds - updates position and size of the currently processed window
...@@ -1187,16 +1186,16 @@ enum nk_panel_flags { ...@@ -1187,16 +1186,16 @@ enum nk_panel_flags {
/* nk_begin - starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed /* nk_begin - starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @title window title and identifier. Needs to be persitent over frames to identify the window * @title window title and identifier. Needs to be persistent over frames to identify the window
* @bounds initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame * @bounds initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame
* @flags window flags defined in `enum nk_panel_flags` with a number of different window behaviors * @flags window flags defined in `enum nk_panel_flags` with a number of different window behaviors
* Return values: * Return values:
* returns 1 if the window can be filled up with widgets from this point until `nk_end or 0 otherwise for example if minimized `*/ * returns 1 if the window can be filled up with widgets from this point until `nk_end or 0 otherwise for example if minimized `*/
NK_API int nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags); NK_API int nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags);
/* nk_begin_titled - extended window start with seperated title and identifier to allow multiple windows with same name but not title /* nk_begin_titled - extended window start with separated title and identifier to allow multiple windows with same name but not title
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @name window identifier. Needs to be persitent over frames to identify the window * @name window identifier. Needs to be persistent over frames to identify the window
* @title window title displayed inside header if flag `NK_WINDOW_TITLE` or either `NK_WINDOW_CLOSABLE` or `NK_WINDOW_MINIMIZED` was set * @title window title displayed inside header if flag `NK_WINDOW_TITLE` or either `NK_WINDOW_CLOSABLE` or `NK_WINDOW_MINIMIZED` was set
* @bounds initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame * @bounds initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame
* @flags window flags defined in `enum nk_panel_flags` with a number of different window behaviors * @flags window flags defined in `enum nk_panel_flags` with a number of different window behaviors
...@@ -1213,7 +1212,7 @@ NK_API void nk_end(struct nk_context *ctx); ...@@ -1213,7 +1212,7 @@ NK_API void nk_end(struct nk_context *ctx);
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @name window identifier * @name window identifier
* Return values: * Return values:
* returns a `nk_window` struct pointing to the idified window or 0 if no window with given name was found */ * returns a `nk_window` struct pointing to the identified window or 0 if no window with given name was found */
NK_API struct nk_window *nk_window_find(struct nk_context *ctx, const char *name); NK_API struct nk_window *nk_window_find(struct nk_context *ctx, const char *name);
/* nk_window_get_bounds - returns a rectangle with screen position and size of the currently processed window. /* nk_window_get_bounds - returns a rectangle with screen position and size of the currently processed window.
* IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end` * IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end`
...@@ -1250,7 +1249,7 @@ NK_API float nk_window_get_width(const struct nk_context*); ...@@ -1250,7 +1249,7 @@ NK_API float nk_window_get_width(const struct nk_context*);
* Return values: * Return values:
* returns the window height */ * returns the window height */
NK_API float nk_window_get_height(const struct nk_context*); NK_API float nk_window_get_height(const struct nk_context*);
/* nk_window_get_panel - returns the underlying panel which contains all processing state of the currnet window. /* nk_window_get_panel - returns the underlying panel which contains all processing state of the current window.
* IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end` * IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end`
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
...@@ -1352,20 +1351,23 @@ NK_API int nk_item_is_any_active(struct nk_context*); ...@@ -1352,20 +1351,23 @@ NK_API int nk_item_is_any_active(struct nk_context*);
* IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end` * IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end`
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @name of the window to modify both position and size
* @bounds points to a `nk_rect` struct with the new position and size of currently active window */ * @bounds points to a `nk_rect` struct with the new position and size of currently active window */
NK_API void nk_window_set_bounds(struct nk_context*, struct nk_rect bounds); NK_API void nk_window_set_bounds(struct nk_context*, const char *name, struct nk_rect bounds);
/* nk_window_set_position - updates position of the currently processed window /* nk_window_set_position - updates position of the currently processed window
* IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end` * IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end`
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @name of the window to modify position of
* @pos points to a `nk_vec2` struct with the new position of currently active window */ * @pos points to a `nk_vec2` struct with the new position of currently active window */
NK_API void nk_window_set_position(struct nk_context*, struct nk_vec2 pos); NK_API void nk_window_set_position(struct nk_context*, const char *name, struct nk_vec2 pos);
/* nk_window_set_size - updates size of the currently processed window /* nk_window_set_size - updates size of the currently processed window
* IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end` * IMPORTANT: only call this function between calls `nk_begin_xxx` and `nk_end`
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @bounds points to a `nk_vec2` struct with the new size of currently active window */ * @name of the window to modify size of
NK_API void nk_window_set_size(struct nk_context*, struct nk_vec2); * @size points to a `nk_vec2` struct with the new size of currently active window */
NK_API void nk_window_set_size(struct nk_context*, const char *name, struct nk_vec2);
/* nk_window_set_focus - sets the window with given name as active /* nk_window_set_focus - sets the window with given name as active
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
...@@ -1386,7 +1388,7 @@ NK_API void nk_window_collapse(struct nk_context*, const char *name, enum nk_col ...@@ -1386,7 +1388,7 @@ NK_API void nk_window_collapse(struct nk_context*, const char *name, enum nk_col
* @ctx must point to an previously initialized `nk_context` struct * @ctx must point to an previously initialized `nk_context` struct
* @name of the window to be either collapse or maximize * @name of the window to be either collapse or maximize
* @state the window should be put into * @state the window should be put into
* @condition that has to be true to actually commit the collsage state change */ * @condition that has to be true to actually commit the collapse state change */
NK_API void nk_window_collapse_if(struct nk_context*, const char *name, enum nk_collapse_states, int cond); NK_API void nk_window_collapse_if(struct nk_context*, const char *name, enum nk_collapse_states, int cond);
/* nk_window_show - updates visibility state of a window with given name /* nk_window_show - updates visibility state of a window with given name
* Parameters: * Parameters:
...@@ -1410,14 +1412,14 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show ...@@ -1410,14 +1412,14 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
* While in this particular implementation there are five different APIs for layouting * While in this particular implementation there are five different APIs for layouting
* each with different trade offs between control and ease of use. * each with different trade offs between control and ease of use.
* *
* All layouting methodes in this library are based around the concept of a row. * All layouting methods in this library are based around the concept of a row.
* A row has a height the window content grows by and a number of columns and each * A row has a height the window content grows by and a number of columns and each
* layouting method specifies how each widget is placed inside the row. * layouting method specifies how each widget is placed inside the row.
* After a row has been allocated by calling a layouting functions and then * After a row has been allocated by calling a layouting functions and then
* filled with widgets will advance an internal pointer over the allocated row. * filled with widgets will advance an internal pointer over the allocated row.
* *
* To acually define a layout you just call the appropriate layouting function * To actually define a layout you just call the appropriate layouting function
* and each subsequnetial widget call will place the widget as specified. Important * and each subsequent widget call will place the widget as specified. Important
* here is that if you define more widgets then columns defined inside the layout * here is that if you define more widgets then columns defined inside the layout
* functions it will allocate the next row without you having to make another layouting * functions it will allocate the next row without you having to make another layouting
* call. * call.
...@@ -1576,8 +1578,8 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show ...@@ -1576,8 +1578,8 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
* one is the static widget size specifier with fixed widget pixel width. They do * one is the static widget size specifier with fixed widget pixel width. They do
* not grow if the row grows and will always stay the same. The second size * not grow if the row grows and will always stay the same. The second size
* specifier is nk_layout_row_template_push_variable which defines a * specifier is nk_layout_row_template_push_variable which defines a
* minumum widget size but it also can grow if more space is available not taken * minimum widget size but it also can grow if more space is available not taken
* by other widgets. Finally there are dynamic widgets which are completly flexible * by other widgets. Finally there are dynamic widgets which are completely flexible
* and unlike variable widgets can even shrink to zero if not enough space * and unlike variable widgets can even shrink to zero if not enough space
* is provided. * is provided.
* *
...@@ -1604,9 +1606,9 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show ...@@ -1604,9 +1606,9 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
* Finally the most flexible API directly allows you to place widgets inside the * Finally the most flexible API directly allows you to place widgets inside the
* window. The space layout API is an immediate mode API which does not support * window. The space layout API is an immediate mode API which does not support
* row auto repeat and directly sets position and size of a widget. Position * row auto repeat and directly sets position and size of a widget. Position
* and size hereby can be either specified as ratio of alloated space or * and size hereby can be either specified as ratio of allocated space or
* allocated space local position and pixel size. Since this API is quite * allocated space local position and pixel size. Since this API is quite
* powerfull there are a number of utility functions to get the available space * powerful there are a number of utility functions to get the available space
* and convert between local allocated space and screen space. * and convert between local allocated space and screen space.
* *
* if (nk_begin_xxx(...) { * if (nk_begin_xxx(...) {
...@@ -1635,7 +1637,7 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show ...@@ -1635,7 +1637,7 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
* nk_layout_widget_bounds - calculates current width a static layout row can fit inside a window * nk_layout_widget_bounds - calculates current width a static layout row can fit inside a window
* nk_layout_ratio_from_pixel - utility functions to calculate window ratio from pixel size * nk_layout_ratio_from_pixel - utility functions to calculate window ratio from pixel size
* *
* nk_layout_row_dynamic - current layout is divided into n same sized gowing columns * nk_layout_row_dynamic - current layout is divided into n same sized growing columns
* nk_layout_row_static - current layout is divided into n same fixed sized columns * nk_layout_row_static - current layout is divided into n same fixed sized columns
* nk_layout_row_begin - starts a new row with given height and number of columns * nk_layout_row_begin - starts a new row with given height and number of columns
* nk_layout_row_push - pushes another column with given size or window ratio * nk_layout_row_push - pushes another column with given size or window ratio
...@@ -1649,17 +1651,17 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show ...@@ -1649,17 +1651,17 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
* nk_layout_row_template_end - marks the end of the row template * nk_layout_row_template_end - marks the end of the row template
* *
* nk_layout_space_begin - begins a new layouting space that allows to specify each widgets position and size * nk_layout_space_begin - begins a new layouting space that allows to specify each widgets position and size
* nk_layout_space_push - pushes position and size of the next widget in own coordiante space either as pixel or ratio * nk_layout_space_push - pushes position and size of the next widget in own coordinate space either as pixel or ratio
* nk_layout_space_end - marks the end of the layouting space * nk_layout_space_end - marks the end of the layouting space
* *
* nk_layout_space_bounds - callable after nk_layout_space_begin and returns total space allocated * nk_layout_space_bounds - callable after nk_layout_space_begin and returns total space allocated
* nk_layout_space_to_screen - convertes vector from nk_layout_space coordiant space into screen space * nk_layout_space_to_screen - converts vector from nk_layout_space coordinate space into screen space
* nk_layout_space_to_local - convertes vector from screem space into nk_layout_space coordinates * nk_layout_space_to_local - converts vector from screen space into nk_layout_space coordinates
* nk_layout_space_rect_to_screen - convertes rectangle from nk_layout_space coordiant space into screen space * nk_layout_space_rect_to_screen - converts rectangle from nk_layout_space coordinate space into screen space
* nk_layout_space_rect_to_local - convertes rectangle from screem space into nk_layout_space coordinates * nk_layout_space_rect_to_local - converts rectangle from screen space into nk_layout_space coordinates
*/ */
/* nk_layout_set_min_row_height - sets the currently used minimum row height. /* nk_layout_set_min_row_height - sets the currently used minimum row height.
* IMPORTANT: The passed height needs to include both your prefered row height * IMPORTANT: The passed height needs to include both your preferred row height
* as well as padding. No internal padding is added. * as well as padding. No internal padding is added.
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` * @ctx must point to an previously initialized `nk_context` struct after call `nk_begin_xxx`
...@@ -1736,7 +1738,7 @@ NK_API void nk_layout_row_template_push_variable(struct nk_context*, float min_w ...@@ -1736,7 +1738,7 @@ NK_API void nk_layout_row_template_push_variable(struct nk_context*, float min_w
/* nk_layout_row_template_push_static - adds a static column that does not grow and will always have the same size /* nk_layout_row_template_push_static - adds a static column that does not grow and will always have the same size
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_row_template_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_row_template_begin`
* @width holds the absolulte pixel width value the next column must be */ * @width holds the absolute pixel width value the next column must be */
NK_API void nk_layout_row_template_push_static(struct nk_context*, float width); NK_API void nk_layout_row_template_push_static(struct nk_context*, float width);
/* nk_layout_row_template_end - marks the end of the row template /* nk_layout_row_template_end - marks the end of the row template
* Parameters: * Parameters:
...@@ -1749,7 +1751,7 @@ NK_API void nk_layout_row_template_end(struct nk_context*); ...@@ -1749,7 +1751,7 @@ NK_API void nk_layout_row_template_end(struct nk_context*);
* @row_height holds height of each widget in row or zero for auto layouting * @row_height holds height of each widget in row or zero for auto layouting
* @widget_count number of widgets inside row */ * @widget_count number of widgets inside row */
NK_API void nk_layout_space_begin(struct nk_context*, enum nk_layout_format, float height, int widget_count); NK_API void nk_layout_space_begin(struct nk_context*, enum nk_layout_format, float height, int widget_count);
/* nk_layout_space_push - pushes position and size of the next widget in own coordiante space either as pixel or ratio /* nk_layout_space_push - pushes position and size of the next widget in own coordinate space either as pixel or ratio
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
* @bounds position and size in laoyut space local coordinates */ * @bounds position and size in laoyut space local coordinates */
...@@ -1762,22 +1764,22 @@ NK_API void nk_layout_space_end(struct nk_context*); ...@@ -1762,22 +1764,22 @@ NK_API void nk_layout_space_end(struct nk_context*);
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` */ * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` */
NK_API struct nk_rect nk_layout_space_bounds(struct nk_context*); NK_API struct nk_rect nk_layout_space_bounds(struct nk_context*);
/* nk_layout_space_to_screen - convertes vector from nk_layout_space coordiant space into screen space /* nk_layout_space_to_screen - converts vector from nk_layout_space coordinate space into screen space
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
* @vec position to convert from layout space into screen coordinate space */ * @vec position to convert from layout space into screen coordinate space */
NK_API struct nk_vec2 nk_layout_space_to_screen(struct nk_context*, struct nk_vec2); NK_API struct nk_vec2 nk_layout_space_to_screen(struct nk_context*, struct nk_vec2);
/* nk_layout_space_to_screen - convertes vector from layout space into screen space /* nk_layout_space_to_screen - converts vector from layout space into screen space
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
* @vec position to convert from screen space into layout coordinate space */ * @vec position to convert from screen space into layout coordinate space */
NK_API struct nk_vec2 nk_layout_space_to_local(struct nk_context*, struct nk_vec2); NK_API struct nk_vec2 nk_layout_space_to_local(struct nk_context*, struct nk_vec2);
/* nk_layout_space_rect_to_screen - convertes rectangle from screen space into layout space /* nk_layout_space_rect_to_screen - converts rectangle from screen space into layout space
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
* @bounds rectangle to convert from layout space into screen space */ * @bounds rectangle to convert from layout space into screen space */
NK_API struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct nk_rect); NK_API struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct nk_rect);
/* nk_layout_space_rect_to_local - convertes rectangle from layout space into screen space /* nk_layout_space_rect_to_local - converts rectangle from layout space into screen space
* Parameters: * Parameters:
* @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` * @ctx must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
* @bounds rectangle to convert from screen space into layout space */ * @bounds rectangle to convert from screen space into layout space */
...@@ -2104,6 +2106,9 @@ NK_API void nk_contextual_end(struct nk_context*); ...@@ -2104,6 +2106,9 @@ NK_API void nk_contextual_end(struct nk_context*);
* *
* ============================================================================= */ * ============================================================================= */
NK_API void nk_tooltip(struct nk_context*, const char*); NK_API void nk_tooltip(struct nk_context*, const char*);
#ifdef NK_INCLUDE_STANDARD_VARARGS
NK_API void nk_tooltipf(struct nk_context*, const char*, ...);
#endif
NK_API int nk_tooltip_begin(struct nk_context*, float width); NK_API int nk_tooltip_begin(struct nk_context*, float width);
NK_API void nk_tooltip_end(struct nk_context*); NK_API void nk_tooltip_end(struct nk_context*);
/* ============================================================================= /* =============================================================================
...@@ -2321,7 +2326,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune ...@@ -2321,7 +2326,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
different ways to use the font atlas. The first two will use your font different ways to use the font atlas. The first two will use your font
handling scheme and only requires essential data to run nuklear. The next handling scheme and only requires essential data to run nuklear. The next
slightly more advanced features is font handling with vertex buffer output. slightly more advanced features is font handling with vertex buffer output.
Finally the most complex API wise is using nuklears font baking API. Finally the most complex API wise is using nuklear's font baking API.
   
1.) Using your own implementation without vertex buffer output 1.) Using your own implementation without vertex buffer output
-------------------------------------------------------------- --------------------------------------------------------------
...@@ -2394,7 +2399,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune ...@@ -2394,7 +2399,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
------------------------------------ ------------------------------------
The final approach if you do not have a font handling functionality or don't The final approach if you do not have a font handling functionality or don't
want to use it in this library is by using the optional font baker. want to use it in this library is by using the optional font baker.
The font baker API's can be used to create a font plus font atlas texture The font baker APIs can be used to create a font plus font atlas texture
and can be used with or without the vertex buffer output. and can be used with or without the vertex buffer output.
   
It still uses the `nk_user_font` struct and the two different approaches It still uses the `nk_user_font` struct and the two different approaches
...@@ -2409,7 +2414,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune ...@@ -2409,7 +2414,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
memory is temporary and therefore can be freed directly after the baking process memory is temporary and therefore can be freed directly after the baking process
is over or permanent you can call `nk_font_atlas_init`. is over or permanent you can call `nk_font_atlas_init`.
   
After successfull intializing the font baker you can add Truetype(.ttf) fonts from After successfully initializing the font baker you can add Truetype(.ttf) fonts from
different sources like memory or from file by calling one of the `nk_font_atlas_add_xxx`. different sources like memory or from file by calling one of the `nk_font_atlas_add_xxx`.
functions. Adding font will permanently store each font, font config and ttf memory block(!) functions. Adding font will permanently store each font, font config and ttf memory block(!)
inside the font atlas and allows to reuse the font atlas. If you don't want to reuse inside the font atlas and allows to reuse the font atlas. If you don't want to reuse
...@@ -2417,7 +2422,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune ...@@ -2417,7 +2422,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
`nk_font_atlas_cleanup` after the baking process is over (after calling nk_font_atlas_end). `nk_font_atlas_cleanup` after the baking process is over (after calling nk_font_atlas_end).
   
As soon as you added all fonts you wanted you can now start the baking process As soon as you added all fonts you wanted you can now start the baking process
for every selected glyphes to image by calling `nk_font_atlas_bake`. for every selected glyph to image by calling `nk_font_atlas_bake`.
The baking process returns image memory, width and height which can be used to The baking process returns image memory, width and height which can be used to
either create your own image object or upload it to any graphics library. either create your own image object or upload it to any graphics library.
No matter which case you finally have to call `nk_font_atlas_end` which No matter which case you finally have to call `nk_font_atlas_end` which
...@@ -2451,7 +2456,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune ...@@ -2451,7 +2456,7 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
I would suggest reading some of my examples `example/` to get a grip on how I would suggest reading some of my examples `example/` to get a grip on how
to use the font atlas. There are a number of details I left out. For example to use the font atlas. There are a number of details I left out. For example
how to merge fonts, configure a font with `nk_font_config` to use other languages, how to merge fonts, configure a font with `nk_font_config` to use other languages,
use another texture coodinate format and a lot more: use another texture coordinate format and a lot more:
   
struct nk_font_config cfg = nk_font_config(font_pixel_height); struct nk_font_config cfg = nk_font_config(font_pixel_height);
cfg.merge_mode = nk_false or nk_true; cfg.merge_mode = nk_false or nk_true;
...@@ -2466,7 +2471,7 @@ typedef void(*nk_query_font_glyph_f)(nk_handle handle, float font_height, ...@@ -2466,7 +2471,7 @@ typedef void(*nk_query_font_glyph_f)(nk_handle handle, float font_height,
struct nk_user_font_glyph *glyph, struct nk_user_font_glyph *glyph,
nk_rune codepoint, nk_rune next_codepoint); nk_rune codepoint, nk_rune next_codepoint);
   
#ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT #if defined(NK_INCLUDE_VERTEX_BUFFER_OUTPUT) || defined(NK_INCLUDE_SOFTWARE_FONT)
struct nk_user_font_glyph { struct nk_user_font_glyph {
struct nk_vec2 uv[2]; struct nk_vec2 uv[2];
/* texture coordinates */ /* texture coordinates */
...@@ -2500,6 +2505,7 @@ enum nk_font_coord_type { ...@@ -2500,6 +2505,7 @@ enum nk_font_coord_type {
NK_COORD_PIXEL /* texture coordinates inside font glyphs are in absolute pixel */ NK_COORD_PIXEL /* texture coordinates inside font glyphs are in absolute pixel */
}; };
   
struct nk_font;
struct nk_baked_font { struct nk_baked_font {
float height; float height;
/* height of the font */ /* height of the font */
...@@ -2545,6 +2551,8 @@ struct nk_font_config { ...@@ -2545,6 +2551,8 @@ struct nk_font_config {
/* font to setup in the baking process: NOTE: not needed for font atlas */ /* font to setup in the baking process: NOTE: not needed for font atlas */
nk_rune fallback_glyph; nk_rune fallback_glyph;
/* fallback glyph to use if a given rune is not found */ /* fallback glyph to use if a given rune is not found */
struct nk_font_config *n;
struct nk_font_config *p;
}; };
   
struct nk_font_glyph { struct nk_font_glyph {
...@@ -2786,7 +2794,7 @@ NK_API int nk_str_len_char(struct nk_str*); ...@@ -2786,7 +2794,7 @@ NK_API int nk_str_len_char(struct nk_str*);
* First of is the most basic way of just providing a simple char array with * First of is the most basic way of just providing a simple char array with
* string length. This method is probably the easiest way of handling simple * string length. This method is probably the easiest way of handling simple
* user text input. Main upside is complete control over memory while the biggest * user text input. Main upside is complete control over memory while the biggest
* downside in comparsion with the other two approaches is missing undo/redo. * downside in comparison with the other two approaches is missing undo/redo.
* *
* For UIs that require undo/redo the second way was created. It is based on * For UIs that require undo/redo the second way was created. It is based on
* a fixed size nk_text_edit struct, which has an internal undo/redo stack. * a fixed size nk_text_edit struct, which has an internal undo/redo stack.
...@@ -2933,8 +2941,8 @@ NK_API void nk_textedit_redo(struct nk_text_edit*); ...@@ -2933,8 +2941,8 @@ NK_API void nk_textedit_redo(struct nk_text_edit*);
but also returns the state of the widget space. If your widget is not seen and does but also returns the state of the widget space. If your widget is not seen and does
not have to be updated it is '0' and you can just return. If it only has not have to be updated it is '0' and you can just return. If it only has
to be drawn the state will be `NK_WIDGET_ROM` otherwise you can do both to be drawn the state will be `NK_WIDGET_ROM` otherwise you can do both
update and draw your widget. The reason for seperating is to only draw and update and draw your widget. The reason for separating is to only draw and
update what is actually neccessary which is crucial for performance. update what is actually necessary which is crucial for performance.
*/ */
enum nk_command_type { enum nk_command_type {
NK_COMMAND_NOP, NK_COMMAND_NOP,
...@@ -4241,7 +4249,7 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum { ...@@ -4241,7 +4249,7 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
#define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0) #define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0)
#endif #endif
   
#endif /* NK_H_ */ #endif /* NK_NUKLEAR_H_ */
/* /*
* ============================================================== * ==============================================================
* *
...@@ -4371,7 +4379,7 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255}; ...@@ -4371,7 +4379,7 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255};
---- ----
For square root nuklear uses the famous fast inverse square root: For square root nuklear uses the famous fast inverse square root:
https://en.wikipedia.org/wiki/Fast_inverse_square_root with https://en.wikipedia.org/wiki/Fast_inverse_square_root with
slightly tweaked magic constant. While on todays hardware it is slightly tweaked magic constant. While on today's hardware it is
probably not faster it is still fast and accurate enough for probably not faster it is still fast and accurate enough for
nuklear's use cases. IMPORTANT: this requires float format IEEE 754 nuklear's use cases. IMPORTANT: this requires float format IEEE 754
   
...@@ -4382,7 +4390,7 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255}; ...@@ -4382,7 +4390,7 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255};
approximate exactly that range is that nuklear only needs sine and approximate exactly that range is that nuklear only needs sine and
cosine to generate circles which only requires that exact range. cosine to generate circles which only requires that exact range.
In addition I used Remez instead of Taylor for additional precision: In addition I used Remez instead of Taylor for additional precision:
www.lolengine.net/blog/2011/12/21/better-function-approximatations. www.lolengine.net/blog/2011/12/21/better-function-approximations.
   
The tool I used to generate constants for both sine and cosine The tool I used to generate constants for both sine and cosine
(it can actually approximate a lot more functions) can be (it can actually approximate a lot more functions) can be
...@@ -4889,7 +4897,7 @@ nk_strmatch_fuzzy_text(const char *str, int str_len, ...@@ -4889,7 +4897,7 @@ nk_strmatch_fuzzy_text(const char *str, int str_len,
const char *pattern, int *out_score) const char *pattern, int *out_score)
{ {
/* Returns true if each character in pattern is found sequentially within str /* Returns true if each character in pattern is found sequentially within str
* if found then outScore is also set. Score value has no intrinsic meaning. * if found then out_score is also set. Score value has no intrinsic meaning.
* Range varies with pattern. Can only compare scores with same search pattern. */ * Range varies with pattern. Can only compare scores with same search pattern. */
   
/* ------- scores --------- */ /* ------- scores --------- */
...@@ -5067,7 +5075,7 @@ nk_iceilf(float x) ...@@ -5067,7 +5075,7 @@ nk_iceilf(float x)
{ {
if (x >= 0) { if (x >= 0) {
int i = (int)x; int i = (int)x;
return i; return (x > i) ? i+1: i;
} else { } else {
int t = (int)x; int t = (int)x;
float r = x - (float)t; float r = x - (float)t;
...@@ -5638,7 +5646,7 @@ nk_file_load(const char* path, nk_size* siz, struct nk_allocator *alloc) ...@@ -5638,7 +5646,7 @@ nk_file_load(const char* path, nk_size* siz, struct nk_allocator *alloc)
fclose(fd); fclose(fd);
return 0; return 0;
} }
*siz = (nk_size)fread(buf, *siz, 1, fd); *siz = (nk_size)fread(buf, 1,*siz, fd);
fclose(fd); fclose(fd);
return buf; return buf;
} }
...@@ -7963,10 +7971,16 @@ nk_draw_list_push_image(struct nk_draw_list *list, nk_handle texture) ...@@ -7963,10 +7971,16 @@ nk_draw_list_push_image(struct nk_draw_list *list, nk_handle texture)
nk_draw_list_push_command(list, nk_null_rect, texture); nk_draw_list_push_command(list, nk_null_rect, texture);
} else { } else {
struct nk_draw_command *prev = nk_draw_list_command_last(list); struct nk_draw_command *prev = nk_draw_list_command_last(list);
if (prev->elem_count == 0) if (prev->elem_count == 0) {
prev->texture = texture; prev->texture = texture;
else if (prev->texture.id != texture.id) #ifdef NK_INCLUDE_COMMAND_USERDATA
nk_draw_list_push_command(list, prev->clip_rect, texture); prev->userdata = list->userdata;
#endif
} else if (prev->texture.id != texture.id
#ifdef NK_INCLUDE_COMMAND_USERDATA
|| prev->userdata.id != list->userdata.id
#endif
) nk_draw_list_push_command(list, prev->clip_rect, texture);
} }
} }
   
...@@ -8586,12 +8600,42 @@ nk_draw_list_path_arc_to(struct nk_draw_list *list, struct nk_vec2 center, ...@@ -8586,12 +8600,42 @@ nk_draw_list_path_arc_to(struct nk_draw_list *list, struct nk_vec2 center,
NK_ASSERT(list); NK_ASSERT(list);
if (!list) return; if (!list) return;
if (radius == 0.0f) return; if (radius == 0.0f) return;
/* This algorithm for arc drawing relies on these two trigonometric identities[1]:
sin(a + b) = sin(a) * cos(b) + cos(a) * sin(b)
cos(a + b) = cos(a) * cos(b) - sin(a) * sin(b)
Two coordinates (x, y) of a point on a circle centered on
the origin can be written in polar form as:
x = r * cos(a)
y = r * sin(a)
where r is the radius of the circle,
a is the angle between (x, y) and the origin.
This allows us to rotate the coordinates around the
origin by an angle b using the following transformation:
x' = r * cos(a + b) = x * cos(b) - y * sin(b)
y' = r * sin(a + b) = y * cos(b) + x * sin(b)
[1] https://en.wikipedia.org/wiki/List_of_trigonometric_identities#Angle_sum_and_difference_identities
*/
{const float d_angle = (a_max - a_min) / (float)segments;
const float sin_d = (float)NK_SIN(d_angle);
const float cos_d = (float)NK_COS(d_angle);
float cx = (float)NK_COS(a_min) * radius;
float cy = (float)NK_SIN(a_min) * radius;
for(i = 0; i <= segments; ++i) { for(i = 0; i <= segments; ++i) {
const float a = a_min + ((float)i / ((float)segments) * (a_max - a_min)); float new_cx, new_cy;
const float x = center.x + (float)NK_COS(a) * radius; const float x = center.x + cx;
const float y = center.y + (float)NK_SIN(a) * radius; const float y = center.y + cy;
nk_draw_list_path_line_to(list, nk_vec2(x, y)); nk_draw_list_path_line_to(list, nk_vec2(x, y));
}
new_cx = cx * cos_d - cy * sin_d;
new_cy = cy * cos_d + cx * sin_d;
cx = new_cx;
cy = new_cy;
}}
} }
   
NK_API void NK_API void
...@@ -11270,7 +11314,7 @@ nk_font_baker_memory(nk_size *temp, int *glyph_count, ...@@ -11270,7 +11314,7 @@ nk_font_baker_memory(nk_size *temp, int *glyph_count,
{ {
int range_count = 0; int range_count = 0;
int total_range_count = 0; int total_range_count = 0;
struct nk_font_config *iter; struct nk_font_config *iter, *i;
   
NK_ASSERT(config_list); NK_ASSERT(config_list);
NK_ASSERT(glyph_count); NK_ASSERT(glyph_count);
...@@ -11279,16 +11323,15 @@ nk_font_baker_memory(nk_size *temp, int *glyph_count, ...@@ -11279,16 +11323,15 @@ nk_font_baker_memory(nk_size *temp, int *glyph_count,
*glyph_count = 0; *glyph_count = 0;
return; return;
} }
*glyph_count = 0; *glyph_count = 0;
if (!config_list->range)
config_list->range = nk_font_default_glyph_ranges();
for (iter = config_list; iter; iter = iter->next) { for (iter = config_list; iter; iter = iter->next) {
range_count = nk_range_count(iter->range); i = iter;
do {if (!i->range) iter->range = nk_font_default_glyph_ranges();
range_count = nk_range_count(i->range);
total_range_count += range_count; total_range_count += range_count;
*glyph_count += nk_range_glyph_count(iter->range, range_count); *glyph_count += nk_range_glyph_count(i->range, range_count);
} while ((i = i->n) != iter);
} }
*temp = (nk_size)*glyph_count * sizeof(struct nk_rp_rect); *temp = (nk_size)*glyph_count * sizeof(struct nk_rp_rect);
*temp += (nk_size)total_range_count * sizeof(struct nk_tt_pack_range); *temp += (nk_size)total_range_count * sizeof(struct nk_tt_pack_range);
*temp += (nk_size)*glyph_count * sizeof(struct nk_tt_packedchar); *temp += (nk_size)*glyph_count * sizeof(struct nk_tt_packedchar);
...@@ -11320,7 +11363,7 @@ nk_font_bake_pack(struct nk_font_baker *baker, ...@@ -11320,7 +11363,7 @@ nk_font_bake_pack(struct nk_font_baker *baker,
struct nk_allocator *alloc) struct nk_allocator *alloc)
{ {
NK_STORAGE const nk_size max_height = 1024 * 32; NK_STORAGE const nk_size max_height = 1024 * 32;
const struct nk_font_config *config_iter; const struct nk_font_config *config_iter, *it;
int total_glyph_count = 0; int total_glyph_count = 0;
int total_range_count = 0; int total_range_count = 0;
int range_count = 0; int range_count = 0;
...@@ -11335,18 +11378,19 @@ nk_font_bake_pack(struct nk_font_baker *baker, ...@@ -11335,18 +11378,19 @@ nk_font_bake_pack(struct nk_font_baker *baker,
   
if (!image_memory || !width || !height || !config_list || !count) return nk_false; if (!image_memory || !width || !height || !config_list || !count) return nk_false;
for (config_iter = config_list; config_iter; config_iter = config_iter->next) { for (config_iter = config_list; config_iter; config_iter = config_iter->next) {
range_count = nk_range_count(config_iter->range); it = config_iter;
do {range_count = nk_range_count(it->range);
total_range_count += range_count; total_range_count += range_count;
total_glyph_count += nk_range_glyph_count(config_iter->range, range_count); total_glyph_count += nk_range_glyph_count(it->range, range_count);
} while ((it = it->n) != config_iter);
} }
/* setup font baker from temporary memory */ /* setup font baker from temporary memory */
for (config_iter = config_list; config_iter; config_iter = config_iter->next) { for (config_iter = config_list; config_iter; config_iter = config_iter->next) {
const struct nk_font_config *cfg = config_iter; it = config_iter;
if (!nk_tt_InitFont(&baker->build[i++].info, (const unsigned char*)cfg->ttf_blob, 0)) do {if (!nk_tt_InitFont(&baker->build[i++].info, (const unsigned char*)it->ttf_blob, 0))
return nk_false; return nk_false;
} while ((it = it->n) != config_iter);
} }
*height = 0; *height = 0;
*width = (total_glyph_count > 1000) ? 1024 : 512; *width = (total_glyph_count > 1000) ? 1024 : 512;
nk_tt_PackBegin(&baker->spc, 0, (int)*width, (int)max_height, 0, 1, alloc); nk_tt_PackBegin(&baker->spc, 0, (int)*width, (int)max_height, 0, 1, alloc);
...@@ -11375,13 +11419,13 @@ nk_font_bake_pack(struct nk_font_baker *baker, ...@@ -11375,13 +11419,13 @@ nk_font_bake_pack(struct nk_font_baker *baker,
   
/* first font pass: pack all glyphs */ /* first font pass: pack all glyphs */
for (input_i = 0, config_iter = config_list; input_i < count && config_iter; for (input_i = 0, config_iter = config_list; input_i < count && config_iter;
input_i++, config_iter = config_iter->next) config_iter = config_iter->next) {
{ it = config_iter;
int n = 0; do {int n = 0;
int glyph_count; int glyph_count;
const nk_rune *in_range; const nk_rune *in_range;
const struct nk_font_config *cfg = config_iter; const struct nk_font_config *cfg = it;
struct nk_font_bake_data *tmp = &baker->build[input_i]; struct nk_font_bake_data *tmp = &baker->build[input_i++];
   
/* count glyphs + ranges in current font */ /* count glyphs + ranges in current font */
glyph_count = 0; range_count = 0; glyph_count = 0; range_count = 0;
...@@ -11416,6 +11460,7 @@ nk_font_bake_pack(struct nk_font_baker *baker, ...@@ -11416,6 +11460,7 @@ nk_font_bake_pack(struct nk_font_baker *baker,
if (tmp->rects[i].was_packed) if (tmp->rects[i].was_packed)
*height = NK_MAX(*height, tmp->rects[i].y + tmp->rects[i].h); *height = NK_MAX(*height, tmp->rects[i].y + tmp->rects[i].h);
} }
} while ((it = it->n) != config_iter);
} }
NK_ASSERT(rect_n == total_glyph_count); NK_ASSERT(rect_n == total_glyph_count);
NK_ASSERT(char_n == total_glyph_count); NK_ASSERT(char_n == total_glyph_count);
...@@ -11434,6 +11479,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei ...@@ -11434,6 +11479,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
int input_i = 0; int input_i = 0;
nk_rune glyph_n = 0; nk_rune glyph_n = 0;
const struct nk_font_config *config_iter; const struct nk_font_config *config_iter;
const struct nk_font_config *it;
   
NK_ASSERT(image_memory); NK_ASSERT(image_memory);
NK_ASSERT(width); NK_ASSERT(width);
...@@ -11451,25 +11497,25 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei ...@@ -11451,25 +11497,25 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
baker->spc.pixels = (unsigned char*)image_memory; baker->spc.pixels = (unsigned char*)image_memory;
baker->spc.height = (int)height; baker->spc.height = (int)height;
for (input_i = 0, config_iter = config_list; input_i < font_count && config_iter; for (input_i = 0, config_iter = config_list; input_i < font_count && config_iter;
++input_i, config_iter = config_iter->next) config_iter = config_iter->next) {
{ it = config_iter;
const struct nk_font_config *cfg = config_iter; do {const struct nk_font_config *cfg = it;
struct nk_font_bake_data *tmp = &baker->build[input_i]; struct nk_font_bake_data *tmp = &baker->build[input_i++];
nk_tt_PackSetOversampling(&baker->spc, cfg->oversample_h, cfg->oversample_v); nk_tt_PackSetOversampling(&baker->spc, cfg->oversample_h, cfg->oversample_v);
nk_tt_PackFontRangesRenderIntoRects(&baker->spc, &tmp->info, tmp->ranges, nk_tt_PackFontRangesRenderIntoRects(&baker->spc, &tmp->info, tmp->ranges,
(int)tmp->range_count, tmp->rects, &baker->alloc); (int)tmp->range_count, tmp->rects, &baker->alloc);
} } while ((it = it->n) != config_iter);
nk_tt_PackEnd(&baker->spc, &baker->alloc); } nk_tt_PackEnd(&baker->spc, &baker->alloc);
   
/* third pass: setup font and glyphs */ /* third pass: setup font and glyphs */
for (input_i = 0, config_iter = config_list; input_i < font_count && config_iter; for (input_i = 0, config_iter = config_list; input_i < font_count && config_iter;
++input_i, config_iter = config_iter->next) config_iter = config_iter->next) {
{ it = config_iter;
nk_size i = 0; do {nk_size i = 0;
int char_idx = 0; int char_idx = 0;
nk_rune glyph_count = 0; nk_rune glyph_count = 0;
const struct nk_font_config *cfg = config_iter; const struct nk_font_config *cfg = it;
struct nk_font_bake_data *tmp = &baker->build[input_i]; struct nk_font_bake_data *tmp = &baker->build[input_i++];
struct nk_baked_font *dst_font = cfg->font; struct nk_baked_font *dst_font = cfg->font;
   
float font_scale = nk_tt_ScaleForPixelHeight(&tmp->info, cfg->size); float font_scale = nk_tt_ScaleForPixelHeight(&tmp->info, cfg->size);
...@@ -11487,8 +11533,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei ...@@ -11487,8 +11533,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
} }
   
/* fill own baked font glyph array */ /* fill own baked font glyph array */
for (i = 0; i < tmp->range_count; ++i) for (i = 0; i < tmp->range_count; ++i) {
{
struct nk_tt_pack_range *range = &tmp->ranges[i]; struct nk_tt_pack_range *range = &tmp->ranges[i];
for (char_idx = 0; char_idx < range->num_chars; char_idx++) for (char_idx = 0; char_idx < range->num_chars; char_idx++)
{ {
...@@ -11505,7 +11550,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei ...@@ -11505,7 +11550,7 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
(int)height, char_idx, &dummy_x, &dummy_y, &q, 0); (int)height, char_idx, &dummy_x, &dummy_y, &q, 0);
   
/* fill own glyph type with data */ /* fill own glyph type with data */
glyph = &glyphs[dst_font->glyph_offset + (unsigned int)glyph_count]; glyph = &glyphs[dst_font->glyph_offset + dst_font->glyph_count + (unsigned int)glyph_count];
glyph->codepoint = codepoint; glyph->codepoint = codepoint;
glyph->x0 = q.x0; glyph->y0 = q.y0; glyph->x0 = q.x0; glyph->y0 = q.y0;
glyph->x1 = q.x1; glyph->y1 = q.y1; glyph->x1 = q.x1; glyph->y1 = q.y1;
...@@ -11531,8 +11576,9 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei ...@@ -11531,8 +11576,9 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
glyph_count++; glyph_count++;
} }
} }
dst_font->glyph_count = glyph_count; dst_font->glyph_count += glyph_count;
glyph_n += dst_font->glyph_count; glyph_n += glyph_count;
} while ((it = it->n) != config_iter);
} }
} }
   
...@@ -11659,6 +11705,7 @@ nk_font_find_glyph(struct nk_font *font, nk_rune unicode) ...@@ -11659,6 +11705,7 @@ nk_font_find_glyph(struct nk_font *font, nk_rune unicode)
int count; int count;
int total_glyphs = 0; int total_glyphs = 0;
const struct nk_font_glyph *glyph = 0; const struct nk_font_glyph *glyph = 0;
const struct nk_font_config *iter = 0;
   
NK_ASSERT(font); NK_ASSERT(font);
NK_ASSERT(font->glyphs); NK_ASSERT(font->glyphs);
...@@ -11666,15 +11713,17 @@ nk_font_find_glyph(struct nk_font *font, nk_rune unicode) ...@@ -11666,15 +11713,17 @@ nk_font_find_glyph(struct nk_font *font, nk_rune unicode)
if (!font || !font->glyphs) return 0; if (!font || !font->glyphs) return 0;
   
glyph = font->fallback; glyph = font->fallback;
count = nk_range_count(font->info.ranges); iter = font->config;
do {count = nk_range_count(iter->range);
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
nk_rune f = font->info.ranges[(i*2)+0]; nk_rune f = iter->range[(i*2)+0];
nk_rune t = font->info.ranges[(i*2)+1]; nk_rune t = iter->range[(i*2)+1];
int diff = (int)((t - f) + 1); int diff = (int)((t - f) + 1);
if (unicode >= f && unicode <= t) if (unicode >= f && unicode <= t)
return &font->glyphs[((nk_rune)total_glyphs + (unicode - f))]; return &font->glyphs[((nk_rune)total_glyphs + (unicode - f))];
total_glyphs += diff; total_glyphs += diff;
} }
} while ((iter = iter->n) != font->config);
return glyph; return glyph;
} }
   
...@@ -12026,6 +12075,7 @@ nk_font_config(float pixel_height) ...@@ -12026,6 +12075,7 @@ nk_font_config(float pixel_height)
cfg.merge_mode = 0; cfg.merge_mode = 0;
cfg.fallback_glyph = '?'; cfg.fallback_glyph = '?';
cfg.font = 0; cfg.font = 0;
cfg.n = 0;
return cfg; return cfg;
} }
   
...@@ -12109,43 +12159,57 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf ...@@ -12109,43 +12159,57 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf
!atlas->temporary.alloc || !atlas->temporary.free) !atlas->temporary.alloc || !atlas->temporary.free)
return 0; return 0;
   
/* allocate and insert font config into list */ /* allocate font config */
cfg = (struct nk_font_config*) cfg = (struct nk_font_config*)
atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font_config)); atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font_config));
NK_MEMCPY(cfg, config, sizeof(*config)); NK_MEMCPY(cfg, config, sizeof(*config));
cfg->n = cfg;
cfg->p = cfg;
if (!config->merge_mode) {
/* insert font config into list */
if (!atlas->config) { if (!atlas->config) {
atlas->config = cfg; atlas->config = cfg;
cfg->next = 0; cfg->next = 0;
} else { } else {
cfg->next = atlas->config; struct nk_font_config *i = atlas->config;
atlas->config = cfg; while (i->next) i = i->next;
i->next = cfg;
cfg->next = 0;
} }
/* allocate new font */ /* allocate new font */
if (!config->merge_mode) {
font = (struct nk_font*) font = (struct nk_font*)
atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font)); atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font));
NK_ASSERT(font); NK_ASSERT(font);
nk_zero(font, sizeof(*font));
if (!font) return 0; if (!font) return 0;
font->config = cfg; font->config = cfg;
} else {
NK_ASSERT(atlas->font_num);
font = atlas->fonts;
font->config = cfg;
}
   
/* insert font into list */ /* insert font into list */
if (!config->merge_mode) {
if (!atlas->fonts) { if (!atlas->fonts) {
atlas->fonts = font; atlas->fonts = font;
font->next = 0; font->next = 0;
} else { } else {
font->next = atlas->fonts; struct nk_font *i = atlas->fonts;
atlas->fonts = font; while (i->next) i = i->next;
i->next = font;
font->next = 0;
} }
cfg->font = &font->info; cfg->font = &font->info;
} } else {
/* extend previously added font */
struct nk_font *f = 0;
struct nk_font_config *c = 0;
NK_ASSERT(atlas->font_num);
f = atlas->fonts;
c = f->config;
cfg->font = &f->info;
   
cfg->n = c;
cfg->p = c->p;
c->p->n = cfg;
c->p = cfg;
}
/* create own copy of .TTF font blob */ /* create own copy of .TTF font blob */
if (!config->ttf_data_owned_by_atlas) { if (!config->ttf_data_owned_by_atlas) {
cfg->ttf_blob = atlas->permanent.alloc(atlas->permanent.userdata,0, cfg->ttf_size); cfg->ttf_blob = atlas->permanent.alloc(atlas->permanent.userdata,0, cfg->ttf_size);
...@@ -12464,16 +12528,18 @@ nk_font_atlas_cleanup(struct nk_font_atlas *atlas) ...@@ -12464,16 +12528,18 @@ nk_font_atlas_cleanup(struct nk_font_atlas *atlas)
NK_ASSERT(atlas->temporary.free); NK_ASSERT(atlas->temporary.free);
NK_ASSERT(atlas->permanent.alloc); NK_ASSERT(atlas->permanent.alloc);
NK_ASSERT(atlas->permanent.free); NK_ASSERT(atlas->permanent.free);
if (!atlas || !atlas->permanent.alloc || !atlas->permanent.free) return; if (!atlas || !atlas->permanent.alloc || !atlas->permanent.free) return;
if (atlas->config) { if (atlas->config) {
struct nk_font_config *iter, *next; struct nk_font_config *iter;
for (iter = atlas->config; iter; iter = next) { for (iter = atlas->config; iter; iter = iter->next) {
next = iter->next; struct nk_font_config *i;
for (i = iter->n; i != iter; i = i->n) {
atlas->permanent.free(atlas->permanent.userdata, i->ttf_blob);
i->ttf_blob = 0;
}
atlas->permanent.free(atlas->permanent.userdata, iter->ttf_blob); atlas->permanent.free(atlas->permanent.userdata, iter->ttf_blob);
atlas->permanent.free(atlas->permanent.userdata, iter); iter->ttf_blob = 0;
} }
atlas->config = 0;
} }
} }
   
...@@ -12487,7 +12553,23 @@ nk_font_atlas_clear(struct nk_font_atlas *atlas) ...@@ -12487,7 +12553,23 @@ nk_font_atlas_clear(struct nk_font_atlas *atlas)
NK_ASSERT(atlas->permanent.free); NK_ASSERT(atlas->permanent.free);
if (!atlas || !atlas->permanent.alloc || !atlas->permanent.free) return; if (!atlas || !atlas->permanent.alloc || !atlas->permanent.free) return;
   
nk_font_atlas_cleanup(atlas); if (atlas->config) {
struct nk_font_config *iter, *next;
for (iter = atlas->config; iter; iter = next) {
struct nk_font_config *i, *n;
for (i = iter->n; i != iter; i = n) {
n = i->n;
if (i->ttf_blob)
atlas->permanent.free(atlas->permanent.userdata, i->ttf_blob);
atlas->permanent.free(atlas->permanent.userdata, i);
}
next = iter->next;
if (i->ttf_blob)
atlas->permanent.free(atlas->permanent.userdata, iter->ttf_blob);
atlas->permanent.free(atlas->permanent.userdata, iter);
}
atlas->config = 0;
}
if (atlas->fonts) { if (atlas->fonts) {
struct nk_font *iter, *next; struct nk_font *iter, *next;
for (iter = atlas->fonts; iter; iter = next) { for (iter = atlas->fonts; iter; iter = next) {
...@@ -14913,7 +14995,7 @@ nk_draw_progress(struct nk_command_buffer *out, nk_flags state, ...@@ -14913,7 +14995,7 @@ nk_draw_progress(struct nk_command_buffer *out, nk_flags state,
} else nk_draw_image(out, *bounds, &background->data.image, nk_white); } else nk_draw_image(out, *bounds, &background->data.image, nk_white);
   
/* draw cursor */ /* draw cursor */
if (background->type == NK_STYLE_ITEM_COLOR) { if (cursor->type == NK_STYLE_ITEM_COLOR) {
nk_fill_rect(out, *scursor, style->rounding, cursor->data.color); nk_fill_rect(out, *scursor, style->rounding, cursor->data.color);
nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color); nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color);
} else nk_draw_image(out, *scursor, &cursor->data.image, nk_white); } else nk_draw_image(out, *scursor, &cursor->data.image, nk_white);
...@@ -15344,7 +15426,7 @@ nk_edit_draw_text(struct nk_command_buffer *out, ...@@ -15344,7 +15426,7 @@ nk_edit_draw_text(struct nk_command_buffer *out,
while ((text_len < byte_len) && glyph_len) while ((text_len < byte_len) && glyph_len)
{ {
if (unicode == '\n') { if (unicode == '\n') {
/* new line sepeator so draw previous line */ /* new line separator so draw previous line */
struct nk_rect label; struct nk_rect label;
label.y = pos_y + line_offset; label.y = pos_y + line_offset;
label.h = row_height; label.h = row_height;
...@@ -16084,11 +16166,11 @@ nk_do_property(nk_flags *ws, ...@@ -16084,11 +16166,11 @@ nk_do_property(nk_flags *ws,
num_len = nk_strlen(string); num_len = nk_strlen(string);
break; break;
case NK_PROPERTY_FLOAT: case NK_PROPERTY_FLOAT:
nk_dtoa(string, (double)variant->value.f); NK_DTOA(string, (double)variant->value.f);
num_len = nk_string_float_limit(string, NK_MAX_FLOAT_PRECISION); num_len = nk_string_float_limit(string, NK_MAX_FLOAT_PRECISION);
break; break;
case NK_PROPERTY_DOUBLE: case NK_PROPERTY_DOUBLE:
nk_dtoa(string, variant->value.d); NK_DTOA(string, variant->value.d);
num_len = nk_string_float_limit(string, NK_MAX_FLOAT_PRECISION); num_len = nk_string_float_limit(string, NK_MAX_FLOAT_PRECISION);
break; break;
} }
...@@ -17335,18 +17417,22 @@ nk_clear(struct nk_context *ctx) ...@@ -17335,18 +17417,22 @@ nk_clear(struct nk_context *ctx)
/* garbage collector */ /* garbage collector */
iter = ctx->begin; iter = ctx->begin;
while (iter) { while (iter) {
/* make sure minimized windows do not get removed */ /* make sure valid minimized windows do not get removed */
if ((iter->flags & NK_WINDOW_MINIMIZED) && if ((iter->flags & NK_WINDOW_MINIMIZED) &&
!(iter->flags & NK_WINDOW_CLOSED)) { !(iter->flags & NK_WINDOW_CLOSED) &&
iter->seq == ctx->seq) {
iter = iter->next; iter = iter->next;
continue; continue;
} }
/* remove hotness from hidden or closed windows*/ /* remove hotness from hidden or closed windows*/
if (((iter->flags & NK_WINDOW_HIDDEN) || if (((iter->flags & NK_WINDOW_HIDDEN) ||
(iter->flags & NK_WINDOW_CLOSED)) && (iter->flags & NK_WINDOW_CLOSED)) &&
iter == ctx->active) iter == ctx->active) {
ctx->active = iter->next; ctx->active = iter->prev;
ctx->end = iter->prev;
if (ctx->active)
ctx->active->flags &= ~(unsigned)NK_WINDOW_ROM;
}
/* free unused popup windows */ /* free unused popup windows */
if (iter->popup.win && iter->popup.win->seq != ctx->seq) { if (iter->popup.win && iter->popup.win->seq != ctx->seq) {
nk_free_window(ctx, iter->popup.win); nk_free_window(ctx, iter->popup.win);
...@@ -17362,8 +17448,7 @@ nk_clear(struct nk_context *ctx) ...@@ -17362,8 +17448,7 @@ nk_clear(struct nk_context *ctx)
nk_free_table(ctx, it); nk_free_table(ctx, it);
if (it == iter->tables) if (it == iter->tables)
iter->tables = n; iter->tables = n;
} } it = n;
it = n;
}} }}
/* window itself is not used anymore so free */ /* window itself is not used anymore so free */
if (iter->seq != ctx->seq || iter->flags & NK_WINDOW_CLOSED) { if (iter->seq != ctx->seq || iter->flags & NK_WINDOW_CLOSED) {
...@@ -17462,7 +17547,7 @@ nk_finish(struct nk_context *ctx, struct nk_window *win) ...@@ -17462,7 +17547,7 @@ nk_finish(struct nk_context *ctx, struct nk_window *win)
NK_INTERN void NK_INTERN void
nk_build(struct nk_context *ctx) nk_build(struct nk_context *ctx)
{ {
struct nk_window *iter = 0; struct nk_window *it = 0;
struct nk_command *cmd = 0; struct nk_command *cmd = 0;
nk_byte *buffer = 0; nk_byte *buffer = 0;
   
...@@ -17484,38 +17569,38 @@ nk_build(struct nk_context *ctx) ...@@ -17484,38 +17569,38 @@ nk_build(struct nk_context *ctx)
nk_finish_buffer(ctx, &ctx->overlay); nk_finish_buffer(ctx, &ctx->overlay);
} }
/* build one big draw command list out of all window buffers */ /* build one big draw command list out of all window buffers */
iter = ctx->begin; it = ctx->begin;
buffer = (nk_byte*)ctx->memory.memory.ptr; buffer = (nk_byte*)ctx->memory.memory.ptr;
while (iter != 0) { while (it != 0) {
struct nk_window *next = iter->next; struct nk_window *next = it->next;
if (iter->buffer.last == iter->buffer.begin || (iter->flags & NK_WINDOW_HIDDEN)|| if (it->buffer.last == it->buffer.begin || (it->flags & NK_WINDOW_HIDDEN)||
iter->seq != ctx->seq) it->seq != ctx->seq)
goto cont; goto cont;
   
cmd = nk_ptr_add(struct nk_command, buffer, iter->buffer.last); cmd = nk_ptr_add(struct nk_command, buffer, it->buffer.last);
while (next && ((next->buffer.last == next->buffer.begin) || while (next && ((next->buffer.last == next->buffer.begin) ||
(next->flags & NK_WINDOW_HIDDEN))) (next->flags & NK_WINDOW_HIDDEN)))
next = next->next; /* skip empty command buffers */ next = next->next; /* skip empty command buffers */
   
if (next) cmd->next = next->buffer.begin; if (next) cmd->next = next->buffer.begin;
cont: iter = next; cont: it = next;
} }
/* append all popup draw commands into lists */ /* append all popup draw commands into lists */
iter = ctx->begin; it = ctx->begin;
while (iter != 0) { while (it != 0) {
struct nk_window *next = iter->next; struct nk_window *next = it->next;
struct nk_popup_buffer *buf; struct nk_popup_buffer *buf;
if (!iter->popup.buf.active) if (!it->popup.buf.active)
goto skip; goto skip;
   
buf = &iter->popup.buf; buf = &it->popup.buf;
cmd->next = buf->begin; cmd->next = buf->begin;
cmd = nk_ptr_add(struct nk_command, buffer, buf->last); cmd = nk_ptr_add(struct nk_command, buffer, buf->last);
buf->active = nk_false; buf->active = nk_false;
skip: iter = next; skip: it = next;
} }
/* append overlay commands */
if (cmd) { if (cmd) {
/* append overlay commands */
if (ctx->overlay.end != ctx->overlay.begin) if (ctx->overlay.end != ctx->overlay.begin)
cmd->next = ctx->overlay.begin; cmd->next = ctx->overlay.begin;
else cmd->next = ctx->memory.allocated; else cmd->next = ctx->memory.allocated;
...@@ -17537,7 +17622,8 @@ nk__begin(struct nk_context *ctx) ...@@ -17537,7 +17622,8 @@ nk__begin(struct nk_context *ctx)
ctx->build = nk_true; ctx->build = nk_true;
} }
iter = ctx->begin; iter = ctx->begin;
while (iter && ((iter->buffer.begin == iter->buffer.end) || (iter->flags & NK_WINDOW_HIDDEN))) while (iter && ((iter->buffer.begin == iter->buffer.end) ||
(iter->flags & NK_WINDOW_HIDDEN) || iter->seq != ctx->seq))
iter = iter->next; iter = iter->next;
if (!iter) return 0; if (!iter) return 0;
return nk_ptr_add_const(struct nk_command, buffer, iter->buffer.begin); return nk_ptr_add_const(struct nk_command, buffer, iter->buffer.begin);
...@@ -18440,7 +18526,7 @@ nk_insert_window(struct nk_context *ctx, struct nk_window *win, ...@@ -18440,7 +18526,7 @@ nk_insert_window(struct nk_context *ctx, struct nk_window *win,
ctx->active = ctx->end; ctx->active = ctx->end;
ctx->end->flags &= ~(nk_flags)NK_WINDOW_ROM; ctx->end->flags &= ~(nk_flags)NK_WINDOW_ROM;
} else { } else {
ctx->end->flags |= NK_WINDOW_ROM; /*ctx->end->flags |= NK_WINDOW_ROM;*/
ctx->begin->prev = win; ctx->begin->prev = win;
win->next = ctx->begin; win->next = ctx->begin;
win->prev = 0; win->prev = 0;
...@@ -18546,27 +18632,28 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, ...@@ -18546,27 +18632,28 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
* provided demo backends). */ * provided demo backends). */
NK_ASSERT(win->seq != ctx->seq); NK_ASSERT(win->seq != ctx->seq);
win->seq = ctx->seq; win->seq = ctx->seq;
if (!ctx->active && !(win->flags & NK_WINDOW_HIDDEN)) if (!ctx->active && !(win->flags & NK_WINDOW_HIDDEN)) {
ctx->active = win; ctx->active = win;
ctx->end = win;
}
} }
if (win->flags & NK_WINDOW_HIDDEN) { if (win->flags & NK_WINDOW_HIDDEN) {
ctx->current = win; ctx->current = win;
win->layout = 0; win->layout = 0;
return 0; return 0;
} } else nk_start(ctx, win);
   
/* window overlapping */ /* window overlapping */
if (!(win->flags & NK_WINDOW_HIDDEN) && !(win->flags & NK_WINDOW_NO_INPUT)) if (!(win->flags & NK_WINDOW_HIDDEN) && !(win->flags & NK_WINDOW_NO_INPUT))
{ {
int inpanel, ishovered; int inpanel, ishovered;
const struct nk_window *iter = win; struct nk_window *iter = win;
float h = ctx->style.font->height + 2.0f * style->window.header.padding.y + float h = ctx->style.font->height + 2.0f * style->window.header.padding.y +
(2.0f * style->window.header.label_padding.y); (2.0f * style->window.header.label_padding.y);
struct nk_rect win_bounds = (!(win->flags & NK_WINDOW_MINIMIZED))? struct nk_rect win_bounds = (!(win->flags & NK_WINDOW_MINIMIZED))?
win->bounds: nk_rect(win->bounds.x, win->bounds.y, win->bounds.w, h); win->bounds: nk_rect(win->bounds.x, win->bounds.y, win->bounds.w, h);
   
/* activate window if hovered and no other window is overlapping this window */ /* activate window if hovered and no other window is overlapping this window */
nk_start(ctx, win);
inpanel = nk_input_has_mouse_click_down_in_rect(&ctx->input, NK_BUTTON_LEFT, win_bounds, nk_true); inpanel = nk_input_has_mouse_click_down_in_rect(&ctx->input, NK_BUTTON_LEFT, win_bounds, nk_true);
inpanel = inpanel && ctx->input.mouse.buttons[NK_BUTTON_LEFT].clicked; inpanel = inpanel && ctx->input.mouse.buttons[NK_BUTTON_LEFT].clicked;
ishovered = nk_input_is_mouse_hovering_rect(&ctx->input, win_bounds); ishovered = nk_input_is_mouse_hovering_rect(&ctx->input, win_bounds);
...@@ -18577,7 +18664,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, ...@@ -18577,7 +18664,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
iter->bounds: nk_rect(iter->bounds.x, iter->bounds.y, iter->bounds.w, h); iter->bounds: nk_rect(iter->bounds.x, iter->bounds.y, iter->bounds.w, h);
if (NK_INTERSECT(win_bounds.x, win_bounds.y, win_bounds.w, win_bounds.h, if (NK_INTERSECT(win_bounds.x, win_bounds.y, win_bounds.w, win_bounds.h,
iter_bounds.x, iter_bounds.y, iter_bounds.w, iter_bounds.h) && iter_bounds.x, iter_bounds.y, iter_bounds.w, iter_bounds.h) &&
(!(iter->flags & NK_WINDOW_HIDDEN) || !(iter->flags & NK_WINDOW_BACKGROUND))) (!(iter->flags & NK_WINDOW_HIDDEN)))
break; break;
   
if (iter->popup.win && iter->popup.active && !(iter->flags & NK_WINDOW_HIDDEN) && if (iter->popup.win && iter->popup.active && !(iter->flags & NK_WINDOW_HIDDEN) &&
...@@ -18590,7 +18677,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, ...@@ -18590,7 +18677,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
} }
   
/* activate window if clicked */ /* activate window if clicked */
if (iter && inpanel && (win != ctx->end) && !(iter->flags & NK_WINDOW_BACKGROUND)) { if (iter && inpanel && (win != ctx->end)) {
iter = win->next; iter = win->next;
while (iter) { while (iter) {
/* try to find a panel with higher priority in the same position */ /* try to find a panel with higher priority in the same position */
...@@ -18608,7 +18695,17 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, ...@@ -18608,7 +18695,17 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
iter = iter->next; iter = iter->next;
} }
} }
if (iter && !(win->flags & NK_WINDOW_ROM) && (win->flags & NK_WINDOW_BACKGROUND)) {
win->flags |= (nk_flags)NK_WINDOW_ROM;
iter->flags &= ~(nk_flags)NK_WINDOW_ROM;
ctx->active = iter;
if (!(iter->flags & NK_WINDOW_BACKGROUND)) {
/* current window is active in that position so transfer to top
* at the highest priority in stack */
nk_remove_window(ctx, iter);
nk_insert_window(ctx, iter, NK_INSERT_BACK);
}
} else {
if (!iter && ctx->end != win) { if (!iter && ctx->end != win) {
if (!(win->flags & NK_WINDOW_BACKGROUND)) { if (!(win->flags & NK_WINDOW_BACKGROUND)) {
/* current window is active in that position so transfer to top /* current window is active in that position so transfer to top
...@@ -18622,7 +18719,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, ...@@ -18622,7 +18719,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
if (ctx->end != win && !(win->flags & NK_WINDOW_BACKGROUND)) if (ctx->end != win && !(win->flags & NK_WINDOW_BACKGROUND))
win->flags |= NK_WINDOW_ROM; win->flags |= NK_WINDOW_ROM;
} }
}
win->layout = (struct nk_panel*)nk_create_panel(ctx); win->layout = (struct nk_panel*)nk_create_panel(ctx);
ctx->current = win; ctx->current = win;
ret = nk_panel_begin(ctx, title, NK_PANEL_WINDOW); ret = nk_panel_begin(ctx, title, NK_PANEL_WINDOW);
...@@ -18770,6 +18867,8 @@ nk_window_is_hovered(struct nk_context *ctx) ...@@ -18770,6 +18867,8 @@ nk_window_is_hovered(struct nk_context *ctx)
NK_ASSERT(ctx); NK_ASSERT(ctx);
NK_ASSERT(ctx->current); NK_ASSERT(ctx->current);
if (!ctx || !ctx->current) return 0; if (!ctx || !ctx->current) return 0;
if(ctx->current->flags & NK_WINDOW_HIDDEN)
return 0;
return nk_input_is_mouse_hovering_rect(&ctx->input, ctx->current->bounds); return nk_input_is_mouse_hovering_rect(&ctx->input, ctx->current->bounds);
} }
   
...@@ -18782,6 +18881,11 @@ nk_window_is_any_hovered(struct nk_context *ctx) ...@@ -18782,6 +18881,11 @@ nk_window_is_any_hovered(struct nk_context *ctx)
iter = ctx->begin; iter = ctx->begin;
while (iter) { while (iter) {
/* check if window is being hovered */ /* check if window is being hovered */
if(!(iter->flags & NK_WINDOW_HIDDEN)) {
/* check if window popup is being hovered */
if (iter->popup.active && iter->popup.win && nk_input_is_mouse_hovering_rect(&ctx->input, iter->popup.win->bounds))
return 1;
if (iter->flags & NK_WINDOW_MINIMIZED) { if (iter->flags & NK_WINDOW_MINIMIZED) {
struct nk_rect header = iter->bounds; struct nk_rect header = iter->bounds;
header.h = ctx->style.font->height + 2 * ctx->style.window.header.padding.y; header.h = ctx->style.font->height + 2 * ctx->style.window.header.padding.y;
...@@ -18790,9 +18894,7 @@ nk_window_is_any_hovered(struct nk_context *ctx) ...@@ -18790,9 +18894,7 @@ nk_window_is_any_hovered(struct nk_context *ctx)
} else if (nk_input_is_mouse_hovering_rect(&ctx->input, iter->bounds)) { } else if (nk_input_is_mouse_hovering_rect(&ctx->input, iter->bounds)) {
return 1; return 1;
} }
/* check if window popup is being hovered */ }
if (iter->popup.active && iter->popup.win && nk_input_is_mouse_hovering_rect(&ctx->input, iter->popup.win->bounds))
return 1;
iter = iter->next; iter = iter->next;
} }
return 0; return 0;
...@@ -18895,29 +18997,36 @@ nk_window_close(struct nk_context *ctx, const char *name) ...@@ -18895,29 +18997,36 @@ nk_window_close(struct nk_context *ctx, const char *name)
} }
   
NK_API void NK_API void
nk_window_set_bounds(struct nk_context *ctx, struct nk_rect bounds) nk_window_set_bounds(struct nk_context *ctx,
const char *name, struct nk_rect bounds)
{ {
NK_ASSERT(ctx); NK_ASSERT(ctx->current); struct nk_window *win;
if (!ctx || !ctx->current) return; NK_ASSERT(ctx);
ctx->current->bounds = bounds; if (!ctx) return;
win = nk_window_find(ctx, name);
if (!win) return;
NK_ASSERT(ctx->current != win && "You cannot update a currently in procecss window");
win->bounds = bounds;
} }
   
NK_API void NK_API void
nk_window_set_position(struct nk_context *ctx, struct nk_vec2 pos) nk_window_set_position(struct nk_context *ctx,
const char *name, struct nk_vec2 pos)
{ {
NK_ASSERT(ctx); NK_ASSERT(ctx->current); struct nk_window *win = nk_window_find(ctx, name);
if (!ctx || !ctx->current) return; if (!win) return;
ctx->current->bounds.x = pos.x; win->bounds.x = pos.x;
ctx->current->bounds.y = pos.y; win->bounds.y = pos.y;
} }
   
NK_API void NK_API void
nk_window_set_size(struct nk_context *ctx, struct nk_vec2 size) nk_window_set_size(struct nk_context *ctx,
const char *name, struct nk_vec2 size)
{ {
NK_ASSERT(ctx); NK_ASSERT(ctx->current); struct nk_window *win = nk_window_find(ctx, name);
if (!ctx || !ctx->current) return; if (!win) return;
ctx->current->bounds.w = size.x; win->bounds.w = size.x;
ctx->current->bounds.h = size.y; win->bounds.h = size.y;
} }
   
NK_API void NK_API void
...@@ -19845,6 +19954,9 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) ...@@ -19845,6 +19954,9 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx)
layout->row.index = 0; layout->row.index = 0;
} }
nk_layout_widget_space(bounds, ctx, win, nk_false); nk_layout_widget_space(bounds, ctx, win, nk_false);
if (!layout->row.index) {
bounds->x -= layout->row.item_offset;
}
layout->at_y = y; layout->at_y = y;
layout->row.index = index; layout->row.index = index;
} }
...@@ -21204,8 +21316,8 @@ nk_edit_string(struct nk_context *ctx, nk_flags flags, ...@@ -21204,8 +21316,8 @@ nk_edit_string(struct nk_context *ctx, nk_flags flags,
win->edit.sel_start = edit->select_start; win->edit.sel_start = edit->select_start;
win->edit.sel_end = edit->select_end; win->edit.sel_end = edit->select_end;
win->edit.mode = edit->mode; win->edit.mode = edit->mode;
win->edit.scrollbar.x = (nk_ushort)edit->scrollbar.x; win->edit.scrollbar.x = (nk_uint)edit->scrollbar.x;
win->edit.scrollbar.y = (nk_ushort)edit->scrollbar.y; win->edit.scrollbar.y = (nk_uint)edit->scrollbar.y;
} }
return state; return state;
} }
...@@ -21250,7 +21362,9 @@ nk_edit_buffer(struct nk_context *ctx, nk_flags flags, ...@@ -21250,7 +21362,9 @@ nk_edit_buffer(struct nk_context *ctx, nk_flags flags,
} }
if (flags & NK_EDIT_CLIPBOARD) if (flags & NK_EDIT_CLIPBOARD)
edit->clip = ctx->clip; edit->clip = ctx->clip;
} edit->active = (unsigned char)win->edit.active;
} else edit->active = nk_false;
edit->mode = win->edit.mode;
   
filter = (!filter) ? nk_filter_default: filter; filter = (!filter) ? nk_filter_default: filter;
prev_state = (unsigned char)edit->active; prev_state = (unsigned char)edit->active;
...@@ -22361,10 +22475,10 @@ nk_tooltip_begin(struct nk_context *ctx, float width) ...@@ -22361,10 +22475,10 @@ nk_tooltip_begin(struct nk_context *ctx, float width)
if (win->popup.win && (win->popup.type & NK_PANEL_SET_NONBLOCK)) if (win->popup.win && (win->popup.type & NK_PANEL_SET_NONBLOCK))
return 0; return 0;
   
bounds.w = width; bounds.w = (float) nk_iceilf(width);
bounds.h = nk_null_rect.h; bounds.h = (float) nk_iceilf(nk_null_rect.h);
bounds.x = (in->mouse.pos.x + 1) - win->layout->clip.x; bounds.x = nk_ifloorf(in->mouse.pos.x + 1) - win->layout->clip.x;
bounds.y = (in->mouse.pos.y + 1) - win->layout->clip.y; bounds.y = nk_ifloorf(in->mouse.pos.y + 1) - win->layout->clip.y;
   
ret = nk_popup_begin(ctx, NK_POPUP_DYNAMIC, ret = nk_popup_begin(ctx, NK_POPUP_DYNAMIC,
"__##Tooltip##__", NK_WINDOW_NO_SCROLLBAR|NK_WINDOW_BORDER, bounds); "__##Tooltip##__", NK_WINDOW_NO_SCROLLBAR|NK_WINDOW_BORDER, bounds);
...@@ -22420,6 +22534,19 @@ nk_tooltip(struct nk_context *ctx, const char *text) ...@@ -22420,6 +22534,19 @@ nk_tooltip(struct nk_context *ctx, const char *text)
nk_tooltip_end(ctx); nk_tooltip_end(ctx);
} }
} }
#ifdef NK_INCLUDE_STANDARD_VARARGS
NK_API void
nk_tooltipf(struct nk_context *ctx, const char *fmt, ...)
{
char buf[256];
va_list args;
va_start(args, fmt);
nk_strfmt(buf, NK_LEN(buf), fmt, args);
va_end(args);
nk_tooltip(ctx, buf);
}
#endif
/* ------------------------------------------------------------- /* -------------------------------------------------------------
* *
* CONTEXTUAL * CONTEXTUAL
...@@ -23587,4 +23714,4 @@ NK_API void ...@@ -23587,4 +23714,4 @@ NK_API void
nk_menu_end(struct nk_context *ctx) nk_menu_end(struct nk_context *ctx)
{nk_contextual_end(ctx);} {nk_contextual_end(ctx);}
   
#endif #endif /* NK_IMPLEMENTATION */
deps/nuklear_glfw_gl2.h
+ 13
− 4
View file @ 5f8431d7
...@@ -75,6 +75,8 @@ static struct nk_glfw { ...@@ -75,6 +75,8 @@ static struct nk_glfw {
int text_len; int text_len;
struct nk_vec2 scroll; struct nk_vec2 scroll;
double last_button_click; double last_button_click;
int is_double_click_down;
struct nk_vec2 double_click_pos;
} glfw; } glfw;
NK_INTERN void NK_INTERN void
...@@ -219,10 +221,12 @@ nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int m ...@@ -219,10 +221,12 @@ nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int m
glfwGetCursorPos(window, &x, &y); glfwGetCursorPos(window, &x, &y);
if (action == GLFW_PRESS) { if (action == GLFW_PRESS) {
double dt = glfwGetTime() - glfw.last_button_click; double dt = glfwGetTime() - glfw.last_button_click;
if (dt > NK_GLFW_DOUBLE_CLICK_LO && dt < NK_GLFW_DOUBLE_CLICK_HI) if (dt > NK_GLFW_DOUBLE_CLICK_LO && dt < NK_GLFW_DOUBLE_CLICK_HI) {
nk_input_button(&glfw.ctx, NK_BUTTON_DOUBLE, (int)x, (int)y, nk_true); glfw.is_double_click_down = nk_true;
glfw.double_click_pos = nk_vec2((float)x, (float)y);
}
glfw.last_button_click = glfwGetTime(); glfw.last_button_click = glfwGetTime();
} else nk_input_button(&glfw.ctx, NK_BUTTON_DOUBLE, (int)x, (int)y, nk_false); } else glfw.is_double_click_down = nk_false;
} }
NK_INTERN void NK_INTERN void
...@@ -261,6 +265,10 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state) ...@@ -261,6 +265,10 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
glfw.ctx.clip.paste = nk_glfw3_clipbard_paste; glfw.ctx.clip.paste = nk_glfw3_clipbard_paste;
glfw.ctx.clip.userdata = nk_handle_ptr(0); glfw.ctx.clip.userdata = nk_handle_ptr(0);
nk_buffer_init_default(&glfw.ogl.cmds); nk_buffer_init_default(&glfw.ogl.cmds);
glfw.is_double_click_down = nk_false;
glfw.double_click_pos = nk_vec2(0, 0);
return &glfw.ctx; return &glfw.ctx;
} }
...@@ -344,7 +352,7 @@ nk_glfw3_new_frame(void) ...@@ -344,7 +352,7 @@ nk_glfw3_new_frame(void)
glfwGetCursorPos(win, &x, &y); glfwGetCursorPos(win, &x, &y);
nk_input_motion(ctx, (int)x, (int)y); nk_input_motion(ctx, (int)x, (int)y);
if (ctx->input.mouse.grabbed) { if (ctx->input.mouse.grabbed) {
glfwSetCursorPos(glfw.win, ctx->input.mouse.prev.x, ctx->input.mouse.prev.y); glfwSetCursorPos(glfw.win, (double)ctx->input.mouse.prev.x, (double)ctx->input.mouse.prev.y);
ctx->input.mouse.pos.x = ctx->input.mouse.prev.x; ctx->input.mouse.pos.x = ctx->input.mouse.prev.x;
ctx->input.mouse.pos.y = ctx->input.mouse.prev.y; ctx->input.mouse.pos.y = ctx->input.mouse.prev.y;
} }
...@@ -352,6 +360,7 @@ nk_glfw3_new_frame(void) ...@@ -352,6 +360,7 @@ nk_glfw3_new_frame(void)
nk_input_button(ctx, NK_BUTTON_LEFT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS); nk_input_button(ctx, NK_BUTTON_LEFT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS);
nk_input_button(ctx, NK_BUTTON_MIDDLE, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS); nk_input_button(ctx, NK_BUTTON_MIDDLE, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS);
nk_input_button(ctx, NK_BUTTON_RIGHT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS); nk_input_button(ctx, NK_BUTTON_RIGHT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS);
nk_input_button(ctx, NK_BUTTON_DOUBLE, (int)glfw.double_click_pos.x, (int)glfw.double_click_pos.y, glfw.is_double_click_down);
nk_input_scroll(ctx, glfw.scroll); nk_input_scroll(ctx, glfw.scroll);
nk_input_end(&glfw.ctx); nk_input_end(&glfw.ctx);
glfw.text_len = 0; glfw.text_len = 0;
......
tests/gamma.c
+ 1
− 1
View file @ 5f8431d7
...@@ -135,13 +135,13 @@ int main(int argc, char** argv) ...@@ -135,13 +135,13 @@ int main(int argc, char** argv)
glfwGetWindowSize(window, &width, &height); glfwGetWindowSize(window, &width, &height);
area = nk_rect(0.f, 0.f, (float) width, (float) height); area = nk_rect(0.f, 0.f, (float) width, (float) height);
nk_window_set_bounds(nk, "", area);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
nk_glfw3_new_frame(); nk_glfw3_new_frame();
if (nk_begin(nk, "", area, 0)) if (nk_begin(nk, "", area, 0))
{ {
const GLFWgammaramp* ramp; const GLFWgammaramp* ramp;
nk_window_set_bounds(nk, area);
nk_layout_row_dynamic(nk, 30, 3); nk_layout_row_dynamic(nk, 30, 3);
if (nk_slider_float(nk, 0.1f, &gamma_value, 5.f, 0.1f)) if (nk_slider_float(nk, 0.1f, &gamma_value, 5.f, 0.1f))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment