Merge pull request #597 from waywardmonkeys/fix-typos
Fix spelling mistakes
This commit is contained in:
Rob Loach
GitHub
commit
8e5c9f7f34
|
|
@ -6,4 +6,4 @@ This backend provides support for [SFML 2.4](http://www.sfml-dev.org). It will w
|
|||
|
||||
You have to edit the Makefile provided so that you can build the demo. Edit the SFML_DIR variable to point to your SFML root folder. This will be the folder to which SFML was installed and contains the lib and include folders.
|
||||
|
||||
On Linux there is an extra step. You need to install the the udev development files.
|
||||
On Linux there is an extra step. You need to install the udev development files.
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@ This backend uses Glad to handle OpenGL extensions. You can download the Glad fi
|
|||
|
||||
Once SFML and Glad have been installed on your system you have to edit the Makefile provided so that you can build the demo. There are two variables that need to be edited: SFML_DIR and GLAD_DIR. Make these point to your SFML root folder and Glad root folder respectively.
|
||||
|
||||
On Linux there is an extra step. You need to install the the udev development files.
|
||||
On Linux there is an extra step. You need to install the udev development files.
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ NK_WINDOW_NO_INPUT | Prevents window of scaling, moving or getting focu
|
|||
#### nk_collapse_states
|
||||
State | Description
|
||||
----------------|-----------------------------------------------------------
|
||||
__NK_MINIMIZED__| UI section is collased and not visible until maximized
|
||||
__NK_MINIMIZED__| UI section is collapsed and not visible until maximized
|
||||
__NK_MAXIMIZED__| UI section is extended and visible until minimized
|
||||
<br /><br />
|
||||
#### nk_begin
|
||||
|
|
@ -1267,7 +1267,7 @@ Parameter | Description
|
|||
__ctx__ | Must point to an previously initialized `nk_context` struct
|
||||
__name__ | Identifier of the window to either hide or show
|
||||
__state__ | state with either visible or hidden to modify the window with
|
||||
__cond__ | condition that has to be met to actually commit the visbility state change
|
||||
__cond__ | condition that has to be met to actually commit the visibility state change
|
||||
### Layouting
|
||||
Layouting in general describes placing widget inside a window with position and size.
|
||||
While in this particular implementation there are five different APIs for layouting
|
||||
|
|
@ -1306,7 +1306,7 @@ functions should be fine.
|
|||
if the owning window grows in width. So the number of columns dictates
|
||||
the size of each widget dynamically by formula:
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
widget_width = (window_width - padding - spacing) * (1/colum_count)
|
||||
widget_width = (window_width - padding - spacing) * (1/column_count)
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Just like all other layouting APIs if you define more widget than columns this
|
||||
library will allocate a new row and keep all layouting parameters previously
|
||||
|
|
@ -2760,7 +2760,7 @@ X...XXXXXXXXXXXXX...X - "
|
|||
dynamic and static widgets.
|
||||
- 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit.
|
||||
- 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows.
|
||||
- 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error.
|
||||
- 2016/12/03 (1.29.1) - Fixed wrapped text with no separator and C89 error.
|
||||
- 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters.
|
||||
- 2016/11/22 (1.28.6) - Fixed window minimized closing bug.
|
||||
- 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior.
|
||||
|
|
@ -2898,7 +2898,7 @@ X...XXXXXXXXXXXXX...X - "
|
|||
precision.
|
||||
- 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`.
|
||||
- 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading
|
||||
to wrong wiget width calculation which results in widgets falsely
|
||||
to wrong widget width calculation which results in widgets falsely
|
||||
becoming tagged as not inside window and cannot be accessed.
|
||||
- 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and
|
||||
closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown
|
||||
|
|
|
|||
16
nuklear.h
16
nuklear.h
|
|
@ -1463,7 +1463,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
|
|||
/// #### nk_collapse_states
|
||||
/// State | Description
|
||||
/// ----------------|-----------------------------------------------------------
|
||||
/// __NK_MINIMIZED__| UI section is collased and not visible until maximized
|
||||
/// __NK_MINIMIZED__| UI section is collapsed and not visible until maximized
|
||||
/// __NK_MAXIMIZED__| UI section is extended and visible until minimized
|
||||
/// <br /><br />
|
||||
*/
|
||||
|
|
@ -2001,11 +2001,11 @@ NK_API void nk_window_show(struct nk_context*, const char *name, enum nk_show_st
|
|||
/// __ctx__ | Must point to an previously initialized `nk_context` struct
|
||||
/// __name__ | Identifier of the window to either hide or show
|
||||
/// __state__ | state with either visible or hidden to modify the window with
|
||||
/// __cond__ | condition that has to be met to actually commit the visbility state change
|
||||
/// __cond__ | condition that has to be met to actually commit the visibility state change
|
||||
*/
|
||||
NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show_states, int cond);
|
||||
/*/// #### nk_window_show_if
|
||||
/// Line for visual seperation. Draws a line with thickness determined by the current row height.
|
||||
/// Line for visual separation. Draws a line with thickness determined by the current row height.
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
/// void nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, NK_BOOL rounding)
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -2069,7 +2069,7 @@ NK_API void nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, nk
|
|||
/// the size of each widget dynamically by formula:
|
||||
///
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
/// widget_width = (window_width - padding - spacing) * (1/colum_count)
|
||||
/// widget_width = (window_width - padding - spacing) * (1/column_count)
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
///
|
||||
/// Just like all other layouting APIs if you define more widget than columns this
|
||||
|
|
@ -11142,7 +11142,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0
|
|||
if (node->y > min_y) {
|
||||
/* raise min_y higher. */
|
||||
/* we've accounted for all waste up to min_y, */
|
||||
/* but we'll now add more waste for everything we've visted */
|
||||
/* but we'll now add more waste for everything we've visited */
|
||||
waste_area += visited_width * (node->y - min_y);
|
||||
min_y = node->y;
|
||||
/* the first time through, visited_width might be reduced */
|
||||
|
|
@ -11297,7 +11297,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i
|
|||
|
||||
/* insert the new node into the right starting point, and */
|
||||
/* let 'cur' point to the remaining nodes needing to be */
|
||||
/* stiched back in */
|
||||
/* stitched back in */
|
||||
|
||||
cur = *res.prev_link;
|
||||
if (cur->x < res.x) {
|
||||
|
|
@ -30269,7 +30269,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
|
|||
/// dynamic and static widgets.
|
||||
/// - 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit.
|
||||
/// - 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows.
|
||||
/// - 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error.
|
||||
/// - 2016/12/03 (1.29.1) - Fixed wrapped text with no separator and C89 error.
|
||||
/// - 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters.
|
||||
/// - 2016/11/22 (1.28.6) - Fixed window minimized closing bug.
|
||||
/// - 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior.
|
||||
|
|
@ -30407,7 +30407,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
|
|||
/// precision.
|
||||
/// - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`.
|
||||
/// - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading
|
||||
/// to wrong wiget width calculation which results in widgets falsely
|
||||
/// to wrong widget width calculation which results in widgets falsely
|
||||
/// becoming tagged as not inside window and cannot be accessed.
|
||||
/// - 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and
|
||||
/// closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
/// dynamic and static widgets.
|
||||
/// - 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit.
|
||||
/// - 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows.
|
||||
/// - 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error.
|
||||
/// - 2016/12/03 (1.29.1) - Fixed wrapped text with no separator and C89 error.
|
||||
/// - 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters.
|
||||
/// - 2016/11/22 (1.28.6) - Fixed window minimized closing bug.
|
||||
/// - 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior.
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
/// precision.
|
||||
/// - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`.
|
||||
/// - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading
|
||||
/// to wrong wiget width calculation which results in widgets falsely
|
||||
/// to wrong widget width calculation which results in widgets falsely
|
||||
/// becoming tagged as not inside window and cannot be accessed.
|
||||
/// - 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and
|
||||
/// closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown
|
||||
|
|
|
|||
|
|
@ -1241,7 +1241,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
|
|||
/// #### nk_collapse_states
|
||||
/// State | Description
|
||||
/// ----------------|-----------------------------------------------------------
|
||||
/// __NK_MINIMIZED__| UI section is collased and not visible until maximized
|
||||
/// __NK_MINIMIZED__| UI section is collapsed and not visible until maximized
|
||||
/// __NK_MAXIMIZED__| UI section is extended and visible until minimized
|
||||
/// <br /><br />
|
||||
*/
|
||||
|
|
@ -1779,11 +1779,11 @@ NK_API void nk_window_show(struct nk_context*, const char *name, enum nk_show_st
|
|||
/// __ctx__ | Must point to an previously initialized `nk_context` struct
|
||||
/// __name__ | Identifier of the window to either hide or show
|
||||
/// __state__ | state with either visible or hidden to modify the window with
|
||||
/// __cond__ | condition that has to be met to actually commit the visbility state change
|
||||
/// __cond__ | condition that has to be met to actually commit the visibility state change
|
||||
*/
|
||||
NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show_states, int cond);
|
||||
/*/// #### nk_window_show_if
|
||||
/// Line for visual seperation. Draws a line with thickness determined by the current row height.
|
||||
/// Line for visual separation. Draws a line with thickness determined by the current row height.
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
/// void nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, NK_BOOL rounding)
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -1847,7 +1847,7 @@ NK_API void nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, nk
|
|||
/// the size of each widget dynamically by formula:
|
||||
///
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
/// widget_width = (window_width - padding - spacing) * (1/colum_count)
|
||||
/// widget_width = (window_width - padding - spacing) * (1/column_count)
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
///
|
||||
/// Just like all other layouting APIs if you define more widget than columns this
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0
|
|||
if (node->y > min_y) {
|
||||
// raise min_y higher.
|
||||
// we've accounted for all waste up to min_y,
|
||||
// but we'll now add more waste for everything we've visted
|
||||
// but we'll now add more waste for everything we've visited
|
||||
waste_area += visited_width * (node->y - min_y);
|
||||
min_y = node->y;
|
||||
// the first time through, visited_width might be reduced
|
||||
|
|
@ -466,7 +466,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i
|
|||
|
||||
// insert the new node into the right starting point, and
|
||||
// let 'cur' point to the remaining nodes needing to be
|
||||
// stiched back in
|
||||
// stitched back in
|
||||
|
||||
cur = *res.prev_link;
|
||||
if (cur->x < res.x) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue