Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Carsten
commit
716ec74bc0
|
|
@ -8,14 +8,42 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- uses: actions/checkout@v4
|
||||
- name: apt-update
|
||||
run: sudo apt-get update -qq
|
||||
- name: apt get glfw
|
||||
run: sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libglew-dev
|
||||
- name: build opengl2
|
||||
- name: apt get demo-libs
|
||||
run: sudo apt-get install -y --no-install-recommends liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libwayland-dev libx11-dev libxft-dev wayland-protocols
|
||||
- name: build allegro5
|
||||
run: make -C demo/allegro5
|
||||
- name: build glfw_opengl2
|
||||
run: make -C demo/glfw_opengl2
|
||||
- name: build opengl3
|
||||
- name: build glfw_opengl3
|
||||
run: make -C demo/glfw_opengl3
|
||||
- name: build glfw_opengl4
|
||||
run: make -C demo/glfw_opengl4
|
||||
# - name: build glfw_vulkan
|
||||
# run: make -C demo/glfw_vulkan
|
||||
- name: build sdl_opengl2
|
||||
run: make -C demo/sdl_opengl2
|
||||
- name: build sdl_opengl3
|
||||
run: make -C demo/sdl_opengl3
|
||||
- name: build sdl_opengles2
|
||||
run: make -C demo/sdl_opengles2
|
||||
- name: build sdl_renderer
|
||||
run: make -C demo/sdl_renderer
|
||||
- name: build sdl2surface_rawfb
|
||||
run: make -C demo/sdl2surface_rawfb
|
||||
- name: build wayland_rawfb
|
||||
run: make -C demo/wayland_rawfb
|
||||
- name: build x11
|
||||
run: make -C demo/x11
|
||||
- name: build x11_opengl2
|
||||
run: make -C demo/x11_opengl2
|
||||
- name: build x11_opengl3
|
||||
run: make -C demo/x11_opengl3
|
||||
- name: build x11_rawfb
|
||||
run: make -C demo/x11_rawfb
|
||||
- name: build x11_xft
|
||||
run: make -C demo/x11_xft
|
||||
- name: build example
|
||||
run: make -C example
|
||||
|
|
|
|||
|
|
@ -9,8 +9,9 @@ jobs:
|
|||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: butlerlogic/action-autotag@stable
|
||||
with:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: butlerlogic/action-autotag@1.1.2
|
||||
env:
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
with:
|
||||
root: clib.json
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ example/bin/*
|
|||
docs/xml
|
||||
docs/build
|
||||
docs/src
|
||||
doc/doc*
|
||||
*.tmp
|
||||
*.swo
|
||||
*.swp
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "nuklear",
|
||||
"version": "4.10.5",
|
||||
"version": "4.12.0",
|
||||
"repo": "Immediate-Mode-UI/Nuklear",
|
||||
"description": "A small ANSI C gui toolkit",
|
||||
"keywords": ["gl", "ui", "toolkit"],
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Allegro v5 nuklear backend
|
||||
|
||||
This backend provides support for [Allegro version 5](http://liballeg.org/). It works on on all supported platforms with an OpenGL backend, including iOS and Android.
|
||||
This backend provides support for [Allegro version 5](https://liballeg.github.io). It works on on all supported platforms with an OpenGL backend, including iOS and Android.
|
||||
|
||||
Touch support is provided by handling the first touch (ignoring any extra simultaneous touches) and emitting nuklear mouse events. nuklear will handle only the first touch like a single left-mouse click. Dragging the touch screen emits mouse-move events.
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ NK_API void nk_allegro5_font_set_font(NkAllegro5Font *font);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_ALLEGRO5_IMPLEMENTATION
|
||||
#include <stdio.h>
|
||||
|
||||
#ifndef NK_ALLEGRO5_TEXT_MAX
|
||||
#define NK_ALLEGRO5_TEXT_MAX 256
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,31 +2,22 @@ static int
|
|||
overview(struct nk_context *ctx)
|
||||
{
|
||||
/* window flags */
|
||||
static int show_menu = nk_true;
|
||||
static int titlebar = nk_true;
|
||||
static int border = nk_true;
|
||||
static int resize = nk_true;
|
||||
static int movable = nk_true;
|
||||
static int no_scrollbar = nk_false;
|
||||
static int scale_left = nk_false;
|
||||
static nk_flags window_flags = 0;
|
||||
static int minimizable = nk_true;
|
||||
static nk_bool show_menu = nk_true;
|
||||
static nk_flags window_flags = NK_WINDOW_TITLE|NK_WINDOW_BORDER|NK_WINDOW_SCALABLE|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE;
|
||||
nk_flags actual_window_flags;
|
||||
|
||||
/* popups */
|
||||
static enum nk_style_header_align header_align = NK_HEADER_RIGHT;
|
||||
static int show_app_about = nk_false;
|
||||
static nk_bool show_app_about = nk_false;
|
||||
|
||||
/* window flags */
|
||||
window_flags = 0;
|
||||
ctx->style.window.header.align = header_align;
|
||||
if (border) window_flags |= NK_WINDOW_BORDER;
|
||||
if (resize) window_flags |= NK_WINDOW_SCALABLE;
|
||||
if (movable) window_flags |= NK_WINDOW_MOVABLE;
|
||||
if (no_scrollbar) window_flags |= NK_WINDOW_NO_SCROLLBAR;
|
||||
if (scale_left) window_flags |= NK_WINDOW_SCALE_LEFT;
|
||||
if (minimizable) window_flags |= NK_WINDOW_MINIMIZABLE;
|
||||
|
||||
if (nk_begin(ctx, "Overview", nk_rect(10, 10, 400, 600), window_flags))
|
||||
static nk_bool disable_widgets = nk_false;
|
||||
|
||||
actual_window_flags = window_flags;
|
||||
if (!(actual_window_flags & NK_WINDOW_TITLE))
|
||||
actual_window_flags &= ~(NK_WINDOW_MINIMIZABLE|NK_WINDOW_CLOSABLE);
|
||||
if (nk_begin(ctx, "Overview", nk_rect(10, 10, 400, 600), actual_window_flags))
|
||||
{
|
||||
if (show_menu)
|
||||
{
|
||||
|
|
@ -34,7 +25,7 @@ overview(struct nk_context *ctx)
|
|||
enum menu_states {MENU_DEFAULT, MENU_WINDOWS};
|
||||
static nk_size mprog = 60;
|
||||
static int mslider = 10;
|
||||
static int mcheck = nk_true;
|
||||
static nk_bool mcheck = nk_true;
|
||||
nk_menubar_begin(ctx);
|
||||
|
||||
/* menu #1 */
|
||||
|
|
@ -44,7 +35,7 @@ overview(struct nk_context *ctx)
|
|||
{
|
||||
static size_t prog = 40;
|
||||
static int slider = 10;
|
||||
static int check = nk_true;
|
||||
static nk_bool check = nk_true;
|
||||
nk_layout_row_dynamic(ctx, 25, 1);
|
||||
if (nk_menu_item_label(ctx, "Hide", NK_TEXT_LEFT))
|
||||
show_menu = nk_false;
|
||||
|
|
@ -132,22 +123,30 @@ overview(struct nk_context *ctx)
|
|||
/* window flags */
|
||||
if (nk_tree_push(ctx, NK_TREE_TAB, "Window", NK_MINIMIZED)) {
|
||||
nk_layout_row_dynamic(ctx, 30, 2);
|
||||
nk_checkbox_label(ctx, "Titlebar", &titlebar);
|
||||
nk_checkbox_label(ctx, "Menu", &show_menu);
|
||||
nk_checkbox_label(ctx, "Border", &border);
|
||||
nk_checkbox_label(ctx, "Resizable", &resize);
|
||||
nk_checkbox_label(ctx, "Movable", &movable);
|
||||
nk_checkbox_label(ctx, "No Scrollbar", &no_scrollbar);
|
||||
nk_checkbox_label(ctx, "Minimizable", &minimizable);
|
||||
nk_checkbox_label(ctx, "Scale Left", &scale_left);
|
||||
nk_checkbox_flags_label(ctx, "Titlebar", &window_flags, NK_WINDOW_TITLE);
|
||||
nk_checkbox_flags_label(ctx, "Border", &window_flags, NK_WINDOW_BORDER);
|
||||
nk_checkbox_flags_label(ctx, "Resizable", &window_flags, NK_WINDOW_SCALABLE);
|
||||
nk_checkbox_flags_label(ctx, "Movable", &window_flags, NK_WINDOW_MOVABLE);
|
||||
nk_checkbox_flags_label(ctx, "No Scrollbar", &window_flags, NK_WINDOW_NO_SCROLLBAR);
|
||||
nk_checkbox_flags_label(ctx, "Minimizable", &window_flags, NK_WINDOW_MINIMIZABLE);
|
||||
nk_checkbox_flags_label(ctx, "Scale Left", &window_flags, NK_WINDOW_SCALE_LEFT);
|
||||
nk_checkbox_label(ctx, "Disable widgets", &disable_widgets);
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
if (disable_widgets)
|
||||
nk_widget_disable_begin(ctx);
|
||||
|
||||
if (nk_tree_push(ctx, NK_TREE_TAB, "Widgets", NK_MINIMIZED))
|
||||
{
|
||||
enum options {A,B,C};
|
||||
static int checkbox;
|
||||
static int option;
|
||||
static nk_bool checkbox_left_text_left;
|
||||
static nk_bool checkbox_centered_text_right;
|
||||
static nk_bool checkbox_right_text_right;
|
||||
static nk_bool checkbox_right_text_left;
|
||||
static int option_left;
|
||||
static int option_right;
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Text", NK_MINIMIZED))
|
||||
{
|
||||
/* Text Widgets */
|
||||
|
|
@ -191,6 +190,7 @@ overview(struct nk_context *ctx)
|
|||
nk_layout_row_static(ctx, 30, 100, 2);
|
||||
nk_button_symbol_label(ctx, NK_SYMBOL_TRIANGLE_LEFT, "prev", NK_TEXT_RIGHT);
|
||||
nk_button_symbol_label(ctx, NK_SYMBOL_TRIANGLE_RIGHT, "next", NK_TEXT_LEFT);
|
||||
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
|
|
@ -212,13 +212,21 @@ overview(struct nk_context *ctx)
|
|||
static int range_int_max = 4096;
|
||||
static const float ratio[] = {120, 150};
|
||||
|
||||
nk_layout_row_static(ctx, 30, 100, 1);
|
||||
nk_checkbox_label(ctx, "Checkbox", &checkbox);
|
||||
nk_layout_row_dynamic(ctx, 0, 1);
|
||||
nk_checkbox_label(ctx, "CheckLeft TextLeft", &checkbox_left_text_left);
|
||||
nk_checkbox_label_align(ctx, "CheckCenter TextRight", &checkbox_centered_text_right, NK_WIDGET_ALIGN_CENTERED | NK_WIDGET_ALIGN_MIDDLE, NK_TEXT_RIGHT);
|
||||
nk_checkbox_label_align(ctx, "CheckRight TextRight", &checkbox_right_text_right, NK_WIDGET_LEFT, NK_TEXT_RIGHT);
|
||||
nk_checkbox_label_align(ctx, "CheckRight TextLeft", &checkbox_right_text_left, NK_WIDGET_RIGHT, NK_TEXT_LEFT);
|
||||
|
||||
nk_layout_row_static(ctx, 30, 80, 3);
|
||||
option = nk_option_label(ctx, "optionA", option == A) ? A : option;
|
||||
option = nk_option_label(ctx, "optionB", option == B) ? B : option;
|
||||
option = nk_option_label(ctx, "optionC", option == C) ? C : option;
|
||||
option_left = nk_option_label(ctx, "optionA", option_left == A) ? A : option_left;
|
||||
option_left = nk_option_label(ctx, "optionB", option_left == B) ? B : option_left;
|
||||
option_left = nk_option_label(ctx, "optionC", option_left == C) ? C : option_left;
|
||||
|
||||
nk_layout_row_static(ctx, 30, 80, 3);
|
||||
option_right = nk_option_label_align(ctx, "optionA", option_right == A, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? A : option_right;
|
||||
option_right = nk_option_label_align(ctx, "optionB", option_right == B, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? B : option_right;
|
||||
option_right = nk_option_label_align(ctx, "optionC", option_right == C, NK_WIDGET_RIGHT, NK_TEXT_RIGHT) ? C : option_right;
|
||||
|
||||
nk_layout_row(ctx, NK_STATIC, 30, 2, ratio);
|
||||
nk_labelf(ctx, NK_TEXT_LEFT, "Slider int");
|
||||
|
|
@ -253,35 +261,28 @@ overview(struct nk_context *ctx)
|
|||
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Inactive", NK_MINIMIZED))
|
||||
{
|
||||
static int inactive = 1;
|
||||
static nk_bool inactive = 1;
|
||||
nk_layout_row_dynamic(ctx, 30, 1);
|
||||
nk_checkbox_label(ctx, "Inactive", &inactive);
|
||||
|
||||
nk_layout_row_static(ctx, 30, 80, 1);
|
||||
if (inactive) {
|
||||
struct nk_style_button button;
|
||||
button = ctx->style.button;
|
||||
ctx->style.button.normal = nk_style_item_color(nk_rgb(40,40,40));
|
||||
ctx->style.button.hover = nk_style_item_color(nk_rgb(40,40,40));
|
||||
ctx->style.button.active = nk_style_item_color(nk_rgb(40,40,40));
|
||||
ctx->style.button.border_color = nk_rgb(60,60,60);
|
||||
ctx->style.button.text_background = nk_rgb(60,60,60);
|
||||
ctx->style.button.text_normal = nk_rgb(60,60,60);
|
||||
ctx->style.button.text_hover = nk_rgb(60,60,60);
|
||||
ctx->style.button.text_active = nk_rgb(60,60,60);
|
||||
nk_button_label(ctx, "button");
|
||||
ctx->style.button = button;
|
||||
} else if (nk_button_label(ctx, "button"))
|
||||
nk_widget_disable_begin(ctx);
|
||||
}
|
||||
|
||||
if (nk_button_label(ctx, "button"))
|
||||
fprintf(stdout, "button pressed\n");
|
||||
|
||||
nk_widget_disable_end(ctx);
|
||||
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Selectable", NK_MINIMIZED))
|
||||
{
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "List", NK_MINIMIZED))
|
||||
{
|
||||
static int selected[4] = {nk_false, nk_false, nk_true, nk_false};
|
||||
static nk_bool selected[4] = {nk_false, nk_false, nk_true, nk_false};
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
nk_selectable_label(ctx, "Selectable", NK_TEXT_LEFT, &selected[0]);
|
||||
nk_selectable_label(ctx, "Selectable", NK_TEXT_LEFT, &selected[1]);
|
||||
|
|
@ -293,7 +294,7 @@ overview(struct nk_context *ctx)
|
|||
if (nk_tree_push(ctx, NK_TREE_NODE, "Grid", NK_MINIMIZED))
|
||||
{
|
||||
int i;
|
||||
static int selected[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
|
||||
static nk_bool selected[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
|
||||
nk_layout_row_static(ctx, 50, 50, 4);
|
||||
for (i = 0; i < 16; ++i) {
|
||||
if (nk_selectable_label(ctx, "Z", NK_TEXT_CENTERED, &selected[i])) {
|
||||
|
|
@ -340,7 +341,7 @@ overview(struct nk_context *ctx)
|
|||
*/
|
||||
static float chart_selection = 8.0f;
|
||||
static int current_weapon = 0;
|
||||
static int check_values[5];
|
||||
static nk_bool check_values[5];
|
||||
static float position[3];
|
||||
static struct nk_color combo_color = {130, 50, 50, 255};
|
||||
static struct nk_colorf combo_color2 = {0.509f, 0.705f, 0.2f, 1.0f};
|
||||
|
|
@ -601,6 +602,18 @@ overview(struct nk_context *ctx)
|
|||
}
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Horizontal Rule", NK_MINIMIZED))
|
||||
{
|
||||
nk_layout_row_dynamic(ctx, 12, 1);
|
||||
nk_label(ctx, "Use this to subdivide spaces visually", NK_TEXT_LEFT);
|
||||
nk_layout_row_dynamic(ctx, 4, 1);
|
||||
nk_rule_horizontal(ctx, nk_white, nk_true);
|
||||
nk_layout_row_dynamic(ctx, 75, 1);
|
||||
nk_label_wrap(ctx, "Best used in 'Card'-like layouts, with a bigger title font on top. Takes on the size of the previous layout definition. Rounding optional.");
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
|
||||
|
|
@ -700,8 +713,8 @@ overview(struct nk_context *ctx)
|
|||
if (nk_tree_push(ctx, NK_TREE_TAB, "Popup", NK_MINIMIZED))
|
||||
{
|
||||
static struct nk_color color = {255,0,0, 255};
|
||||
static int select[4];
|
||||
static int popup_active;
|
||||
static nk_bool select[4];
|
||||
static nk_bool popup_active;
|
||||
const struct nk_input *in = &ctx->input;
|
||||
struct nk_rect bounds;
|
||||
|
||||
|
|
@ -870,9 +883,9 @@ overview(struct nk_context *ctx)
|
|||
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Group", NK_MINIMIZED))
|
||||
{
|
||||
static int group_titlebar = nk_false;
|
||||
static int group_border = nk_true;
|
||||
static int group_no_scrollbar = nk_false;
|
||||
static nk_bool group_titlebar = nk_false;
|
||||
static nk_bool group_border = nk_true;
|
||||
static nk_bool group_no_scrollbar = nk_false;
|
||||
static int group_width = 320;
|
||||
static int group_height = 200;
|
||||
|
||||
|
|
@ -898,7 +911,7 @@ overview(struct nk_context *ctx)
|
|||
nk_layout_row_static(ctx, (float)group_height, group_width, 2);
|
||||
if (nk_group_begin(ctx, "Group", group_flags)) {
|
||||
int i = 0;
|
||||
static int selected[16];
|
||||
static nk_bool selected[16];
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
for (i = 0; i < 16; ++i)
|
||||
nk_selectable_label(ctx, (selected[i]) ? "Selected": "Unselected", NK_TEXT_CENTERED, &selected[i]);
|
||||
|
|
@ -908,11 +921,12 @@ overview(struct nk_context *ctx)
|
|||
}
|
||||
if (nk_tree_push(ctx, NK_TREE_NODE, "Tree", NK_MINIMIZED))
|
||||
{
|
||||
static int root_selected = 0;
|
||||
int sel = root_selected;
|
||||
static nk_bool root_selected = 0;
|
||||
nk_bool sel = root_selected;
|
||||
if (nk_tree_element_push(ctx, NK_TREE_NODE, "Root", NK_MINIMIZED, &sel)) {
|
||||
static int selected[8];
|
||||
int i = 0, node_select = selected[0];
|
||||
static nk_bool selected[8];
|
||||
int i = 0;
|
||||
nk_bool node_select = selected[0];
|
||||
if (sel != root_selected) {
|
||||
root_selected = sel;
|
||||
for (i = 0; i < 8; ++i)
|
||||
|
|
@ -920,7 +934,7 @@ overview(struct nk_context *ctx)
|
|||
}
|
||||
if (nk_tree_element_push(ctx, NK_TREE_NODE, "Node", NK_MINIMIZED, &node_select)) {
|
||||
int j = 0;
|
||||
static int sel_nodes[4];
|
||||
static nk_bool sel_nodes[4];
|
||||
if (node_select != selected[0]) {
|
||||
selected[0] = node_select;
|
||||
for (i = 0; i < 4; ++i)
|
||||
|
|
@ -1048,7 +1062,7 @@ overview(struct nk_context *ctx)
|
|||
nk_layout_space_begin(ctx, NK_STATIC, 500, 64);
|
||||
nk_layout_space_push(ctx, nk_rect(0,0,150,500));
|
||||
if (nk_group_begin(ctx, "Group_left", NK_WINDOW_BORDER)) {
|
||||
static int selected[32];
|
||||
static nk_bool selected[32];
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
for (i = 0; i < 32; ++i)
|
||||
nk_selectable_label(ctx, (selected[i]) ? "Selected": "Unselected", NK_TEXT_CENTERED, &selected[i]);
|
||||
|
|
@ -1081,7 +1095,7 @@ overview(struct nk_context *ctx)
|
|||
|
||||
nk_layout_space_push(ctx, nk_rect(320,0,150,150));
|
||||
if (nk_group_begin(ctx, "Group_right_top", NK_WINDOW_BORDER)) {
|
||||
static int selected[4];
|
||||
static nk_bool selected[4];
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
for (i = 0; i < 4; ++i)
|
||||
nk_selectable_label(ctx, (selected[i]) ? "Selected": "Unselected", NK_TEXT_CENTERED, &selected[i]);
|
||||
|
|
@ -1090,7 +1104,7 @@ overview(struct nk_context *ctx)
|
|||
|
||||
nk_layout_space_push(ctx, nk_rect(320,160,150,150));
|
||||
if (nk_group_begin(ctx, "Group_right_center", NK_WINDOW_BORDER)) {
|
||||
static int selected[4];
|
||||
static nk_bool selected[4];
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
for (i = 0; i < 4; ++i)
|
||||
nk_selectable_label(ctx, (selected[i]) ? "Selected": "Unselected", NK_TEXT_CENTERED, &selected[i]);
|
||||
|
|
@ -1099,7 +1113,7 @@ overview(struct nk_context *ctx)
|
|||
|
||||
nk_layout_space_push(ctx, nk_rect(320,320,150,150));
|
||||
if (nk_group_begin(ctx, "Group_right_bottom", NK_WINDOW_BORDER)) {
|
||||
static int selected[4];
|
||||
static nk_bool selected[4];
|
||||
nk_layout_row_static(ctx, 18, 100, 1);
|
||||
for (i = 0; i < 4; ++i)
|
||||
nk_selectable_label(ctx, (selected[i]) ? "Selected": "Unselected", NK_TEXT_CENTERED, &selected[i]);
|
||||
|
|
@ -1288,8 +1302,9 @@ overview(struct nk_context *ctx)
|
|||
}
|
||||
nk_tree_pop(ctx);
|
||||
}
|
||||
if (disable_widgets)
|
||||
nk_widget_disable_end(ctx);
|
||||
}
|
||||
nk_end(ctx);
|
||||
return !nk_window_is_closed(ctx, "Overview");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ NK_API void nk_d3d11_shutdown(void);
|
|||
#define COBJMACROS
|
||||
#include <d3d11.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <float.h>
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ NK_API void nk_d3d12_shutdown(void);
|
|||
#define COBJMACROS
|
||||
#include <d3d12.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <float.h>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ NK_API void nk_d3d9_shutdown(void);
|
|||
#define COBJMACROS
|
||||
#include <d3d9.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ NK_API void nk_gdi_set_font(GdiFont *font);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_GDI_IMPLEMENTATION
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
|
||||
|
|
@ -532,7 +532,8 @@ nk_gdi_draw_text(HDC dc, short x, short y, unsigned short w, unsigned short h,
|
|||
wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0);
|
||||
wstr = (WCHAR*)_alloca(wsize * sizeof(wchar_t));
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);
|
||||
|
||||
|
||||
SetBkMode(dc, TRANSPARENT); /* Transparent Text Background */
|
||||
SetBkColor(dc, convert_color(cbg));
|
||||
SetTextColor(dc, convert_color(cfg));
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ NK_API void nk_gdi_set_font(nk_gdi_ctx gdi, GdiFont* font);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_GDI_IMPLEMENTATION
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -764,7 +764,7 @@ nk_gdipfont_get_text_width(nk_handle handle, float height, const char *text, int
|
|||
|
||||
(void)height;
|
||||
wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0);
|
||||
wstr = (WCHAR*)_alloca(wsize * sizeof(wchar_t));
|
||||
wstr = (WCHAR*)_malloca(wsize * sizeof(wchar_t));
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);
|
||||
|
||||
GdipMeasureString(gdip.memory, wstr, wsize, font->handle, &layout, gdip.format, &bbox, NULL, NULL);
|
||||
|
|
@ -780,93 +780,63 @@ nk_gdipfont_del(GdipFont *font)
|
|||
}
|
||||
|
||||
static void
|
||||
nk_gdip_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
|
||||
nk_gdip_clipboard_paste(nk_handle usr, struct nk_text_edit* edit)
|
||||
{
|
||||
HGLOBAL mem;
|
||||
SIZE_T size;
|
||||
LPCWSTR wstr;
|
||||
int utf8size;
|
||||
char* utf8;
|
||||
(void)usr;
|
||||
|
||||
if (!IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL))
|
||||
return;
|
||||
|
||||
mem = (HGLOBAL)GetClipboardData(CF_UNICODETEXT);
|
||||
if (!mem) {
|
||||
if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL))
|
||||
{
|
||||
HGLOBAL mem = GetClipboardData(CF_UNICODETEXT);
|
||||
if (mem)
|
||||
{
|
||||
SIZE_T size = GlobalSize(mem) - 1;
|
||||
if (size)
|
||||
{
|
||||
LPCWSTR wstr = (LPCWSTR)GlobalLock(mem);
|
||||
if (wstr)
|
||||
{
|
||||
int utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)(size / sizeof(wchar_t)), NULL, 0, NULL, NULL);
|
||||
if (utf8size)
|
||||
{
|
||||
char* utf8 = (char*)malloc(utf8size);
|
||||
if (utf8)
|
||||
{
|
||||
WideCharToMultiByte(CP_UTF8, 0, wstr, (int)(size / sizeof(wchar_t)), utf8, utf8size, NULL, NULL);
|
||||
nk_textedit_paste(edit, utf8, utf8size);
|
||||
free(utf8);
|
||||
}
|
||||
}
|
||||
GlobalUnlock(mem);
|
||||
}
|
||||
}
|
||||
}
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
size = GlobalSize(mem) - 1;
|
||||
if (!size) {
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
wstr = (LPCWSTR)GlobalLock(mem);
|
||||
if (!wstr) {
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)(size / sizeof(wchar_t)), NULL, 0, NULL, NULL);
|
||||
if (!utf8size) {
|
||||
GlobalUnlock(mem);
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
utf8 = (char*)malloc(utf8size);
|
||||
if (!utf8) {
|
||||
GlobalUnlock(mem);
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
WideCharToMultiByte(CP_UTF8, 0, wstr, (int)(size / sizeof(wchar_t)), utf8, utf8size, NULL, NULL);
|
||||
nk_textedit_paste(edit, utf8, utf8size);
|
||||
free(utf8);
|
||||
GlobalUnlock(mem);
|
||||
CloseClipboard();
|
||||
}
|
||||
|
||||
static void
|
||||
nk_gdip_clipboard_copy(nk_handle usr, const char *text, int len)
|
||||
nk_gdip_clipboard_copy(nk_handle usr, const char* text, int len)
|
||||
{
|
||||
HGLOBAL mem;
|
||||
wchar_t* wstr;
|
||||
int wsize;
|
||||
(void)usr;
|
||||
if (OpenClipboard(NULL))
|
||||
{
|
||||
int wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0);
|
||||
if (wsize)
|
||||
{
|
||||
HGLOBAL mem = (HGLOBAL)GlobalAlloc(GMEM_MOVEABLE, (wsize + 1) * sizeof(wchar_t));
|
||||
if (mem)
|
||||
{
|
||||
wchar_t* wstr = (wchar_t*)GlobalLock(mem);
|
||||
if (wstr)
|
||||
{
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);
|
||||
wstr[wsize] = 0;
|
||||
GlobalUnlock(mem);
|
||||
|
||||
if (!OpenClipboard(NULL))
|
||||
return;
|
||||
|
||||
wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0);
|
||||
if (!wsize) {
|
||||
SetClipboardData(CF_UNICODETEXT, mem);
|
||||
}
|
||||
}
|
||||
}
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
mem = (HGLOBAL)GlobalAlloc(GMEM_MOVEABLE, (wsize + 1) * sizeof(wchar_t));
|
||||
if (!mem) {
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
wstr = (wchar_t*)GlobalLock(mem);
|
||||
if (!wstr) {
|
||||
GlobalFree(mem);
|
||||
CloseClipboard();
|
||||
return;
|
||||
}
|
||||
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);
|
||||
wstr[wsize] = 0;
|
||||
GlobalUnlock(mem);
|
||||
if (!SetClipboardData(CF_UNICODETEXT, mem))
|
||||
GlobalFree(mem);
|
||||
CloseClipboard();
|
||||
}
|
||||
|
||||
NK_API struct nk_context*
|
||||
|
|
@ -1000,6 +970,13 @@ nk_gdip_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
|
|||
nk_input_key(&gdip.ctx, NK_KEY_SCROLL_UP, down);
|
||||
return 1;
|
||||
|
||||
case 'A':
|
||||
if (ctrl) {
|
||||
nk_input_key(&gdip.ctx, NK_KEY_TEXT_SELECT_ALL, down);
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'C':
|
||||
if (ctrl) {
|
||||
nk_input_key(&gdip.ctx, NK_KEY_COPY, down);
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ NK_API void nk_gflw3_scroll_callback(GLFWwindow *win, double xof
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_GLFW_GL2_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifndef NK_GLFW_TEXT_MAX
|
||||
#define NK_GLFW_TEXT_MAX 256
|
||||
|
|
|
|||
|
|
@ -78,6 +78,9 @@ NK_API void nk_glfw3_mouse_button_callback(GLFWwindow *win, int
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_GLFW_GL3_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
#ifndef NK_GLFW_DOUBLE_CLICK_LO
|
||||
#define NK_GLFW_DOUBLE_CLICK_LO 0.02
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@ NK_API void nk_glfw3_destroy_texture(int tex_index);
|
|||
*/
|
||||
#ifdef NK_GLFW_GL4_IMPLEMENTATION
|
||||
#undef NK_GLFW_GL4_IMPLEMENTATION
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
#ifndef NK_GLFW_TEXT_MAX
|
||||
#define NK_GLFW_TEXT_MAX 256
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
BasedOnStyle: LLVM
|
||||
# same as .editorconfig
|
||||
IndentWidth: 4
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
src/nuklearshaders/*.spv
|
||||
src/nuklear_glfw_vulkan.h
|
||||
shaders/*.spv
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# Install
|
||||
BIN = demo
|
||||
|
||||
# Flags
|
||||
CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2
|
||||
|
||||
SRC = main.c
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
BIN := $(BIN).exe
|
||||
LIBS = -lglfw3 -lvulkan -lm
|
||||
else
|
||||
UNAME_S := $(shell uname -s)
|
||||
GLFW3 := $(shell pkg-config --libs glfw3)
|
||||
LIBS = $(GLFW3) -lvulkan -lm
|
||||
endif
|
||||
|
||||
|
||||
$(BIN): shaders/demo.vert.spv shaders/demo.frag.spv
|
||||
@mkdir -p bin
|
||||
rm -f bin/$(BIN) $(OBJS)
|
||||
$(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS)
|
||||
|
||||
shaders/demo.vert.spv: shaders/demo.vert
|
||||
glslc --target-env=vulkan shaders/demo.vert -o shaders/demo.vert.spv
|
||||
|
||||
shaders/demo.frag.spv: shaders/demo.frag
|
||||
glslc --target-env=vulkan shaders/demo.frag -o shaders/demo.frag.spv
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
# nuklear glfw vulkan
|
||||
|
||||
## Theory of operation
|
||||
|
||||
The nuklear glfw vulkan integration creates an independent graphics pipeline that will render the nuklear UI to separate render targets.
|
||||
The application is responsible to fully manage these render targets. So it must ensure they are properly sized (and resized when requested).
|
||||
|
||||
Furthermore it is assumed that you will have a swap chain in place and the number of nuklear overlay images and number of swap chain images match.
|
||||
|
||||
This is how you can integrate it in your application:
|
||||
|
||||
```
|
||||
/*
|
||||
Setup: overlay_images have been created and their number match with the number
|
||||
of the swap_chain_images of your application. The overlay_images in this
|
||||
example have the same format as your swap_chain images (optional)
|
||||
*/
|
||||
struct nk_context *ctx = nk_glfw3_init(
|
||||
demo.win, demo.device, demo.physical_device, demo.indices.graphics,
|
||||
demo.overlay_image_views, demo.swap_chain_images_len,
|
||||
demo.swap_chain_image_format, NK_GLFW3_INSTALL_CALLBACKS,
|
||||
MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
|
||||
[...]
|
||||
/*
|
||||
in your draw loop draw you can then render to the overlay image at
|
||||
`image_index`
|
||||
your own application can then wait for the semaphore and produce
|
||||
the swap_chain_image at `image_index`
|
||||
this should simply sample from the overlay_image (see example)
|
||||
*/
|
||||
nk_semaphore semaphore =
|
||||
nk_glfw3_render(demo.graphics_queue, image_index,
|
||||
demo.image_available, NK_ANTI_ALIASING_ON);
|
||||
if (!render(&demo, &bg, nk_semaphore, image_index)) {
|
||||
fprintf(stderr, "render failed\n");
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
You must call `nk_glfw3_resize` whenever the size of the overlay_images resize.
|
||||
|
||||
## Using images
|
||||
|
||||
Images can be used by providing a VkImageView as an nk_image_ptr to nuklear:
|
||||
|
||||
```
|
||||
img = nk_image_ptr(demo.demo_texture_image_view);
|
||||
```
|
||||
|
||||
Note that they must have SHADER_READ_OPTIMAL layout
|
||||
|
||||
It is currently not possible to specify how they are being sampled. The nuklear glfw vulkan integration uses a fixed sampler that does linear filtering.
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,12 @@
|
|||
#version 450
|
||||
#extension GL_ARB_separate_shader_objects : enable
|
||||
|
||||
layout(binding = 0) uniform sampler2D overlay;
|
||||
|
||||
layout(location = 0) in vec2 inUV;
|
||||
|
||||
layout(location = 0) out vec4 outColor;
|
||||
|
||||
void main() {
|
||||
outColor = texture(overlay, inUV);
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
#version 450
|
||||
#extension GL_ARB_separate_shader_objects : enable
|
||||
|
||||
layout (location = 0) out vec2 outUV;
|
||||
|
||||
void main()
|
||||
{
|
||||
outUV = vec2((gl_VertexIndex << 1) & 2, gl_VertexIndex & 2);
|
||||
gl_Position = vec4(outUV * 2.0f + -1.0f, 0.0f, 1.0f);
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
create_shader_inlined_header: nuklearshaders/nuklear.vert.spv nuklearshaders/nuklear.frag.spv
|
||||
awk -v st='// NUKLEAR_SHADERS_START' -v et='// NUKLEAR_SHADERS_END' -v repl="$$(xxd -i nuklearshaders/nuklear.vert.spv && xxd -i nuklearshaders/nuklear.frag.spv)" '$$0 == st{del=1} $$0 == et{$$0 = repl; del=0} !del' nuklear_glfw_vulkan.in.h > nuklear_glfw_vulkan.h
|
||||
|
||||
nuklearshaders/nuklear.vert.spv: nuklearshaders/nuklear.vert
|
||||
glslc --target-env=vulkan nuklearshaders/nuklear.vert -o nuklearshaders/nuklear.vert.spv
|
||||
|
||||
nuklearshaders/nuklear.frag.spv: nuklearshaders/nuklear.frag
|
||||
glslc --target-env=vulkan nuklearshaders/nuklear.frag -o nuklearshaders/nuklear.frag.spv
|
||||
|
||||
clean:
|
||||
rm nuklearshaders/nuklear.vert.spv nuklearshaders/nuklear.frag.spv nuklear_glfw_vulkan.h
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
Contrary to OpenGL Vulkan needs precompiled shaders in the SPIR-V format which makes it a bit more difficult to inline the shadercode.
|
||||
|
||||
After executing `make` the result should be a self contained `nuklear_glfw_vulkan.h`. Copy the result file to the parent directory and the "release" should be done.
|
||||
|
||||
You will need to have `xxd`, `glslc` and `awk` installed for this.
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,13 @@
|
|||
#version 450
|
||||
#extension GL_ARB_separate_shader_objects : enable
|
||||
|
||||
layout(binding = 0, set = 1) uniform sampler2D currentTexture;
|
||||
|
||||
layout(location = 0) in vec4 fragColor;
|
||||
layout(location = 1) in vec2 fragUv;
|
||||
layout(location = 0) out vec4 outColor;
|
||||
|
||||
void main() {
|
||||
vec4 texColor = texture(currentTexture, fragUv);
|
||||
outColor = fragColor * texColor;
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
#version 450
|
||||
#extension GL_ARB_separate_shader_objects : enable
|
||||
|
||||
out gl_PerVertex {
|
||||
vec4 gl_Position;
|
||||
};
|
||||
|
||||
layout(binding = 0) uniform UniformBufferObject {
|
||||
mat4 projection;
|
||||
} ubo;
|
||||
|
||||
layout(location = 0) in vec2 position;
|
||||
layout(location = 1) in vec2 uv;
|
||||
layout(location = 2) in uvec4 color;
|
||||
layout(location = 0) out vec4 fragColor;
|
||||
layout(location = 1) out vec2 fragUv;
|
||||
|
||||
void main() {
|
||||
gl_Position = ubo.projection * vec4(position, 0.0, 1.0);
|
||||
gl_Position.y = -gl_Position.y;
|
||||
fragColor = vec4(color[0]/255.0, color[1]/255.0, color[2]/255.0, color[3]/255.0);
|
||||
fragUv = uv;
|
||||
}
|
||||
|
|
@ -49,6 +49,10 @@ void nk_sdlsurface_shutdown(struct sdlsurface_context *sdlsurfa
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SDLSURFACE_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
struct sdlsurface_context {
|
||||
struct nk_context ctx;
|
||||
struct nk_rect scissors;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ NK_API void nk_sdl_shutdown(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SDL_GL2_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
struct nk_sdl_device {
|
||||
struct nk_buffer cmds;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ NK_API void nk_sdl_device_create(void);
|
|||
*/
|
||||
#ifdef NK_SDL_GL3_IMPLEMENTATION
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
struct nk_sdl_device {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ NK_API void nk_sdl_device_create(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SDL_GLES2_IMPLEMENTATION
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
struct nk_sdl_device {
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ NK_API void nk_sdl_shutdown(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SDL_RENDERER_IMPLEMENTATION
|
||||
|
||||
#include <strings.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
struct nk_sdl_device {
|
||||
struct nk_buffer cmds;
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ NK_API void nk_sfml_shutdown(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SFML_GL2_IMPLEMENTATION
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
struct nk_sfml_device {
|
||||
struct nk_buffer cmds;
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ NK_API void nk_sfml_device_destroy(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_SFML_GL3_IMPLEMENTATION
|
||||
|
||||
#include <cstring>
|
||||
#include <assert.h>
|
||||
#include <string>
|
||||
|
||||
struct nk_sfml_device {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
#ifndef NK_RAW_WAYLAND_H_
|
||||
#define NK_RAW_WAYLAND_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#define WIDTH 800
|
||||
#define HEIGHT 600
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@ NK_API void nk_xfont_del(Display *dpy, XFont *font);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_XLIB_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ NK_API void nk_x11_device_destroy(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_XLIB_GL3_IMPLEMENTATION
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,10 @@ NK_API void nk_rawfb_resize_fb(struct rawfb_context *rawfb, voi
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_RAWFB_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
struct rawfb_image {
|
||||
void *pixels;
|
||||
int w, h, pitch;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,9 @@ NK_API void nk_xlib_shutdown(void);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_XLIBSHM_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@ NK_API void nk_xfont_del(Display *dpy, XFont *font);
|
|||
* ===============================================================
|
||||
*/
|
||||
#ifdef NK_XLIB_IMPLEMENTATION
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,14 @@ LIBS =
|
|||
else
|
||||
UNAME_S := $(shell uname -s)
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
LIBS =
|
||||
LIBS =
|
||||
else
|
||||
LIBS =
|
||||
endif
|
||||
endif
|
||||
|
||||
$(BIN):
|
||||
rm -f $(BIN) $(OBJS)
|
||||
$(BIN): clean
|
||||
$(CC) $(SRC) $(CFLAGS) -o $(BIN)
|
||||
|
||||
clean:
|
||||
rm -f $(BIN) $(OBJS)
|
||||
|
|
|
|||
426
doc/index.html
426
doc/index.html
|
|
@ -1,6 +1,5 @@
|
|||
<meta charset='utf-8' emacsmode='-*- markdown -*-'>
|
||||
<link rel='stylesheet' href='https://casual-effects.com/markdeep/latest/apidoc.css?'>
|
||||
<title>Nuklear</title> <!--Page Title-->
|
||||
# Nuklear
|
||||
|
||||
## Contents
|
||||
|
|
@ -47,6 +46,7 @@ render backends it only focuses on the actual UI.
|
|||
- No global or hidden state
|
||||
- Customizable library modules (you can compile and use only what you need)
|
||||
- Optional font baker and vertex buffer output
|
||||
- [Code available on github](https://github.com/Immediate-Mode-UI/Nuklear/)
|
||||
## Features
|
||||
- Absolutely no platform dependent code
|
||||
- Memory management control ranging from/to
|
||||
|
|
@ -90,7 +90,8 @@ NK_PRIVATE | If defined declares all functions as static, s
|
|||
NK_INCLUDE_FIXED_TYPES | If defined it will include header `<stdint.h>` for fixed sized types otherwise nuklear tries to select the correct type. If that fails it will throw a compiler error and you have to select the correct types yourself.
|
||||
NK_INCLUDE_DEFAULT_ALLOCATOR | If defined it will include header `<stdlib.h>` and provide additional functions to use this library without caring for memory allocation control and therefore ease memory management.
|
||||
NK_INCLUDE_STANDARD_IO | If defined it will include header `<stdio.h>` and provide additional functions depending on file loading.
|
||||
NK_INCLUDE_STANDARD_VARARGS | If defined it will include header <stdio.h> and provide additional functions depending on file loading.
|
||||
NK_INCLUDE_STANDARD_VARARGS | If defined it will include header <stdarg.h> and provide additional functions depending on file loading.
|
||||
NK_INCLUDE_STANDARD_BOOL | If defined it will include header `<stdbool.h>` for nk_bool otherwise nuklear defines nk_bool as int.
|
||||
NK_INCLUDE_VERTEX_BUFFER_OUTPUT | Defining this adds a vertex draw command list backend to this library, which allows you to convert queue commands into vertex draw commands. This is mainly if you need a hardware accessible format for OpenGL, DirectX, Vulkan, Metal,...
|
||||
NK_INCLUDE_FONT_BAKING | Defining this adds `stb_truetype` and `stb_rect_pack` implementation to this library and provides font baking and rendering. If you already have font handling or do not want to use this font handler you don't have to define it.
|
||||
NK_INCLUDE_DEFAULT_FONT | Defining this adds the default font: ProggyClean.ttf into this library which can be loaded into a font atlas and allows using this library without having a truetype font
|
||||
|
|
@ -109,6 +110,7 @@ NK_KEYSTATE_BASED_INPUT | Define this if your backend uses key state for
|
|||
- NK_INCLUDE_FIXED_TYPES
|
||||
- NK_INCLUDE_DEFAULT_ALLOCATOR
|
||||
- NK_INCLUDE_STANDARD_VARARGS
|
||||
- NK_INCLUDE_STANDARD_BOOL
|
||||
- NK_INCLUDE_VERTEX_BUFFER_OUTPUT
|
||||
- NK_INCLUDE_FONT_BAKING
|
||||
- NK_INCLUDE_DEFAULT_FONT
|
||||
|
|
@ -132,7 +134,7 @@ Function | Description
|
|||
NK_ASSERT | If you don't define this, nuklear will use <assert.h> with assert().
|
||||
NK_MEMSET | You can define this to 'memset' or your own memset implementation replacement. If not nuklear will use its own version.
|
||||
NK_MEMCPY | You can define this to 'memcpy' or your own memcpy implementation replacement. If not nuklear will use its own version.
|
||||
NK_SQRT | You can define this to 'sqrt' or your own sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version.
|
||||
NK_INV_SQRT | You can define this to your own inverse sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version.
|
||||
NK_SIN | You can define this to 'sinf' or your own sine implementation replacement. If not nuklear will use its own approximation implementation.
|
||||
NK_COS | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation.
|
||||
NK_STRTOD | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!).
|
||||
|
|
@ -221,7 +223,7 @@ __nk_set_user_data__| Utility function to pass user data to draw command
|
|||
Initializes a `nk_context` struct with a default standard library allocator.
|
||||
Should be used if you don't want to be bothered with memory management in nuklear.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_init_default(struct nk_context *ctx, const struct nk_user_font *font);
|
||||
nk_bool nk_init_default(struct nk_context *ctx, const struct nk_user_font *font);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|---------------------------------------------------------------
|
||||
|
|
@ -235,7 +237,7 @@ Especially recommended for system with little memory or systems with virtual mem
|
|||
For the later case you can just allocate for example 16MB of virtual memory
|
||||
and only the required amount of memory will actually be committed.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_init_fixed(struct nk_context *ctx, void *memory, nk_size size, const struct nk_user_font *font);
|
||||
nk_bool nk_init_fixed(struct nk_context *ctx, void *memory, nk_size size, const struct nk_user_font *font);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
!!! Warning
|
||||
make sure the passed memory block is aligned correctly for `nk_draw_commands`.
|
||||
|
|
@ -251,7 +253,7 @@ Initializes a `nk_context` struct with memory allocation callbacks for nuklear t
|
|||
memory from. Used internally for `nk_init_default` and provides a kitchen sink allocation
|
||||
interface to nuklear. Can be useful for cases like monitoring memory consumption.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_init(struct nk_context *ctx, struct nk_allocator *alloc, const struct nk_user_font *font);
|
||||
nk_bool nk_init(struct nk_context *ctx, struct nk_allocator *alloc, const struct nk_user_font *font);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|---------------------------------------------------------------
|
||||
|
|
@ -264,7 +266,7 @@ Initializes a `nk_context` struct from two different either fixed or growing
|
|||
buffers. The first buffer is for allocating draw commands while the second buffer is
|
||||
used for allocating windows, panels and state tables.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_init_custom(struct nk_context *ctx, struct nk_buffer *cmds, struct nk_buffer *pool, const struct nk_user_font *font);
|
||||
nk_bool nk_init_custom(struct nk_context *ctx, struct nk_buffer *cmds, struct nk_buffer *pool, const struct nk_user_font *font);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|---------------------------------------------------------------
|
||||
|
|
@ -379,7 +381,7 @@ __y__ | Must hold an integer describing the current mouse cursor y-positio
|
|||
#### nk_input_key
|
||||
Mirrors the state of a specific key to nuklear
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
void nk_input_key(struct nk_context*, enum nk_keys key, int down);
|
||||
void nk_input_key(struct nk_context*, enum nk_keys key, nk_bool down);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -389,7 +391,7 @@ __down__ | Must be 0 for key is up and 1 for key is down
|
|||
#### nk_input_button
|
||||
Mirrors the state of a specific mouse button to nuklear
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
void nk_input_button(struct nk_context *ctx, enum nk_buttons btn, int x, int y, int down);
|
||||
void nk_input_button(struct nk_context *ctx, enum nk_buttons btn, int x, int y, nk_bool down);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -884,14 +886,14 @@ 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
|
||||
Starts a new window; needs to be called every frame for every
|
||||
window (unless hidden) or otherwise the window gets removed
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags);
|
||||
nk_bool nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -905,7 +907,7 @@ until `nk_end` or `false(0)` otherwise for example if minimized
|
|||
Extended window start with separated title and identifier to allow multiple
|
||||
windows with same title but not name
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, struct nk_rect bounds, nk_flags flags);
|
||||
nk_bool nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, struct nk_rect bounds, nk_flags flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1086,7 +1088,7 @@ Returns if the currently processed window is currently active
|
|||
!!! WARNING
|
||||
Only call this function between calls `nk_begin_xxx` and `nk_end`
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_has_focus(const struct nk_context *ctx);
|
||||
nk_bool nk_window_has_focus(const struct nk_context *ctx);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1097,7 +1099,7 @@ Return if the current window is being hovered
|
|||
!!! WARNING
|
||||
Only call this function between calls `nk_begin_xxx` and `nk_end`
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_hovered(struct nk_context *ctx);
|
||||
nk_bool nk_window_is_hovered(struct nk_context *ctx);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1106,7 +1108,7 @@ Returns `true(1)` if current window is hovered or `false(0)` otherwise
|
|||
#### nk_window_is_collapsed
|
||||
Returns if the window with given name is currently minimized/collapsed
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_collapsed(struct nk_context *ctx, const char *name);
|
||||
nk_bool nk_window_is_collapsed(struct nk_context *ctx, const char *name);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1117,7 +1119,7 @@ found or is not minimized
|
|||
#### nk_window_is_closed
|
||||
Returns if the window with given name was closed by calling `nk_close`
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_closed(struct nk_context *ctx, const char *name);
|
||||
nk_bool nk_window_is_closed(struct nk_context *ctx, const char *name);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1127,7 +1129,7 @@ Returns `true(1)` if current window was closed or `false(0)` window not found or
|
|||
#### nk_window_is_hidden
|
||||
Returns if the window with given name is hidden
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_hidden(struct nk_context *ctx, const char *name);
|
||||
nk_bool nk_window_is_hidden(struct nk_context *ctx, const char *name);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1137,7 +1139,7 @@ Returns `true(1)` if current window is hidden or `false(0)` window not found or
|
|||
#### nk_window_is_active
|
||||
Same as nk_window_has_focus for some reason
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_active(struct nk_context *ctx, const char *name);
|
||||
nk_bool nk_window_is_active(struct nk_context *ctx, const char *name);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1147,7 +1149,7 @@ Returns `true(1)` if current window is active or `false(0)` window not found or
|
|||
#### nk_window_is_any_hovered
|
||||
Returns if the any window is being hovered
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_window_is_any_hovered(struct nk_context*);
|
||||
nk_bool nk_window_is_any_hovered(struct nk_context*);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1158,7 +1160,7 @@ Returns if the any window is being hovered or any widget is currently active.
|
|||
Can be used to decide if input should be processed by UI or your specific input handling.
|
||||
Example could be UI and 3D camera to move inside a 3D space.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_item_is_any_active(struct nk_context*);
|
||||
nk_bool nk_item_is_any_active(struct nk_context*);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1265,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
|
||||
|
|
@ -1304,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
|
||||
|
|
@ -1731,6 +1733,14 @@ Parameter | Description
|
|||
__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
|
||||
Returns transformed `nk_rect` in layout space coordinates
|
||||
#### nk_spacer
|
||||
Spacer is a dummy widget that consumes space as usual but doesn't draw anything
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
void nk_spacer(struct nk_context* );
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin`
|
||||
### Groups
|
||||
Groups are basically windows inside windows. They allow to subdivide space
|
||||
in a window to layout widgets as a group. Almost all more complex widget
|
||||
|
|
@ -1812,7 +1822,7 @@ nk_group_set_scroll | Sets the scroll offset for the given group
|
|||
#### nk_group_begin
|
||||
Starts a new widget group. Requires a previous layouting function to specify a pos/size.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_group_begin(struct nk_context*, const char *title, nk_flags);
|
||||
nk_bool nk_group_begin(struct nk_context*, const char *title, nk_flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1823,7 +1833,7 @@ Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise
|
|||
#### nk_group_begin_titled
|
||||
Starts a new widget group. Requires a previous layouting function to specify a pos/size.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_group_begin_titled(struct nk_context*, const char *name, const char *title, nk_flags);
|
||||
nk_bool nk_group_begin_titled(struct nk_context*, const char *name, const char *title, nk_flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1844,7 +1854,7 @@ __ctx__ | Must point to an previously initialized `nk_context` struct
|
|||
starts a new widget group. requires a previous layouting function to specify
|
||||
a size. Does not keep track of scrollbar.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_group_scrolled_offset_begin(struct nk_context*, nk_uint *x_offset, nk_uint *y_offset, const char *title, nk_flags flags);
|
||||
nk_bool nk_group_scrolled_offset_begin(struct nk_context*, nk_uint *x_offset, nk_uint *y_offset, const char *title, nk_flags flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1858,7 +1868,7 @@ Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise
|
|||
Starts a new widget group. requires a previous
|
||||
layouting function to specify a size. Does not keep track of scrollbar.
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_group_scrolled_begin(struct nk_context*, struct nk_scroll *off, const char *title, nk_flags);
|
||||
nk_bool nk_group_scrolled_begin(struct nk_context*, struct nk_scroll *off, const char *title, nk_flags);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -1986,7 +1996,7 @@ Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise
|
|||
Start a collapsible UI section with internal state management with full
|
||||
control over internal unique ID used to store state
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed);
|
||||
nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -2035,7 +2045,7 @@ Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise
|
|||
Start a collapsible UI section with internal state management with full
|
||||
control over internal unique ID used to store state
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed);
|
||||
nk_bool nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -2059,7 +2069,7 @@ __ctx__ | Must point to an previously initialized `nk_context` struct after
|
|||
#### nk_tree_state_push
|
||||
Start a collapsible UI section with external state management
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state);
|
||||
nk_bool nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -2071,7 +2081,7 @@ Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise
|
|||
#### nk_tree_state_image_push
|
||||
Start a collapsible UI section with image and label header and external state management
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
int nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state);
|
||||
nk_bool nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Parameter | Description
|
||||
------------|-----------------------------------------------------------
|
||||
|
|
@ -2260,6 +2270,302 @@ __max__ | Maximum value not allowed to be overflown
|
|||
__step__ | Increment added and subtracted on increment and decrement button
|
||||
__inc_per_pixel__ | Value per pixel added or subtracted on dragging
|
||||
Returns the new modified double value
|
||||
### Font
|
||||
Font handling in this library was designed to be quite customizable and lets
|
||||
you decide what you want to use and what you want to provide. There are three
|
||||
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
|
||||
slightly more advanced features is font handling with vertex buffer output.
|
||||
Finally the most complex API wise is using nuklear's font baking API.
|
||||
#### Using your own implementation without vertex buffer output
|
||||
|
||||
So first up the easiest way to do font handling is by just providing a
|
||||
`nk_user_font` struct which only requires the height in pixel of the used
|
||||
font and a callback to calculate the width of a string. This way of handling
|
||||
fonts is best fitted for using the normal draw shape command API where you
|
||||
do all the text drawing yourself and the library does not require any kind
|
||||
of deeper knowledge about which font handling mechanism you use.
|
||||
IMPORTANT: the `nk_user_font` pointer provided to nuklear has to persist
|
||||
over the complete life time! I know this sucks but it is currently the only
|
||||
way to switch between fonts.
|
||||
```c
|
||||
float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
float text_width = ...;
|
||||
return text_width;
|
||||
}
|
||||
struct nk_user_font font;
|
||||
font.userdata.ptr = &your_font_class_or_struct;
|
||||
font.height = your_font_height;
|
||||
font.width = your_text_width_calculation;
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font);
|
||||
```
|
||||
#### Using your own implementation with vertex buffer output
|
||||
|
||||
While the first approach works fine if you don't want to use the optional
|
||||
vertex buffer output it is not enough if you do. To get font handling working
|
||||
for these cases you have to provide two additional parameters inside the
|
||||
`nk_user_font`. First a texture atlas handle used to draw text as subimages
|
||||
of a bigger font atlas texture and a callback to query a character's glyph
|
||||
information (offset, size, ...). So it is still possible to provide your own
|
||||
font and use the vertex buffer output.
|
||||
```c
|
||||
float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
float text_width = ...;
|
||||
return text_width;
|
||||
}
|
||||
void query_your_font_glyph(nk_handle handle, float font_height, struct nk_user_font_glyph *glyph, nk_rune codepoint, nk_rune next_codepoint)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
glyph.width = ...;
|
||||
glyph.height = ...;
|
||||
glyph.xadvance = ...;
|
||||
glyph.uv[0].x = ...;
|
||||
glyph.uv[0].y = ...;
|
||||
glyph.uv[1].x = ...;
|
||||
glyph.uv[1].y = ...;
|
||||
glyph.offset.x = ...;
|
||||
glyph.offset.y = ...;
|
||||
}
|
||||
|
||||
struct nk_user_font font;
|
||||
font.userdata.ptr = &your_font_class_or_struct;
|
||||
font.height = your_font_height;
|
||||
font.width = your_text_width_calculation;
|
||||
font.query = query_your_font_glyph;
|
||||
font.texture.id = your_font_texture;
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font);
|
||||
```
|
||||
#### Nuklear font baker
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
It still uses the `nk_user_font` struct and the two different approaches
|
||||
previously stated still work. The font baker is not located inside
|
||||
`nk_context` like all other systems since it can be understood as more of
|
||||
an extension to nuklear and does not really depend on any `nk_context` state.
|
||||
|
||||
Font baker need to be initialized first by one of the nk_font_atlas_init_xxx
|
||||
functions. If you don't care about memory just call the default version
|
||||
`nk_font_atlas_init_default` which will allocate all memory from the standard library.
|
||||
If you want to control memory allocation but you don't care if the allocated
|
||||
memory is temporary and therefore can be freed directly after the baking process
|
||||
is over or permanent you can call `nk_font_atlas_init`.
|
||||
|
||||
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`.
|
||||
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
|
||||
the font baker by for example adding additional fonts you can call
|
||||
`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
|
||||
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
|
||||
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
|
||||
will free all temporary memory including the font atlas image so make sure
|
||||
you created our texture beforehand. `nk_font_atlas_end` requires a handle
|
||||
to your font texture or object and optionally fills a `struct nk_draw_null_texture`
|
||||
which can be used for the optional vertex output. If you don't want it just
|
||||
set the argument to `NULL`.
|
||||
|
||||
At this point you are done and if you don't want to reuse the font atlas you
|
||||
can call `nk_font_atlas_cleanup` to free all truetype blobs and configuration
|
||||
memory. Finally if you don't use the font atlas and any of it's fonts anymore
|
||||
you need to call `nk_font_atlas_clear` to free all memory still being used.
|
||||
|
||||
```c
|
||||
struct nk_font_atlas atlas;
|
||||
nk_font_atlas_init_default(&atlas);
|
||||
nk_font_atlas_begin(&atlas);
|
||||
nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, 0);
|
||||
nk_font *font2 = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font2.ttf", 16, 0);
|
||||
const void* img = nk_font_atlas_bake(&atlas, &img_width, &img_height, NK_FONT_ATLAS_RGBA32);
|
||||
nk_font_atlas_end(&atlas, nk_handle_id(texture), 0);
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font->handle);
|
||||
while (1) {
|
||||
|
||||
}
|
||||
nk_font_atlas_clear(&atlas);
|
||||
```
|
||||
The font baker API is probably the most complex API inside this library and
|
||||
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
|
||||
how to merge fonts, configure a font with `nk_font_config` to use other languages,
|
||||
use another texture coordinate format and a lot more:
|
||||
```c
|
||||
struct nk_font_config cfg = nk_font_config(font_pixel_height);
|
||||
cfg.merge_mode = nk_false or nk_true;
|
||||
cfg.range = nk_font_korean_glyph_ranges();
|
||||
cfg.coord_type = NK_COORD_PIXEL;
|
||||
nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, &cfg);
|
||||
```
|
||||
### Memory Buffer
|
||||
A basic (double)-buffer with linear allocation and resetting as only
|
||||
freeing policy. The buffer's main purpose is to control all memory management
|
||||
inside the GUI toolkit and still leave memory control as much as possible in
|
||||
the hand of the user while also making sure the library is easy to use if
|
||||
not as much control is needed.
|
||||
In general all memory inside this library can be provided from the user in
|
||||
three different ways.
|
||||
|
||||
The first way and the one providing most control is by just passing a fixed
|
||||
size memory block. In this case all control lies in the hand of the user
|
||||
since he can exactly control where the memory comes from and how much memory
|
||||
the library should consume. Of course using the fixed size API removes the
|
||||
ability to automatically resize a buffer if not enough memory is provided so
|
||||
you have to take over the resizing. While being a fixed sized buffer sounds
|
||||
quite limiting, it is very effective in this library since the actual memory
|
||||
consumption is quite stable and has a fixed upper bound for a lot of cases.
|
||||
|
||||
If you don't want to think about how much memory the library should allocate
|
||||
at all time or have a very dynamic UI with unpredictable memory consumption
|
||||
habits but still want control over memory allocation you can use the dynamic
|
||||
allocator based API. The allocator consists of two callbacks for allocating
|
||||
and freeing memory and optional userdata so you can plugin your own allocator.
|
||||
|
||||
The final and easiest way can be used by defining
|
||||
NK_INCLUDE_DEFAULT_ALLOCATOR which uses the standard library memory
|
||||
allocation functions malloc and free and takes over complete control over
|
||||
memory in this library.
|
||||
### Text Editor
|
||||
Editing text in this library is handled by either `nk_edit_string` or
|
||||
`nk_edit_buffer`. But like almost everything in this library there are multiple
|
||||
ways of doing it and a balance between control and ease of use with memory
|
||||
as well as functionality controlled by flags.
|
||||
This library generally allows three different levels of memory control:
|
||||
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
|
||||
user text input. Main upside is complete control over memory while the biggest
|
||||
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
|
||||
a fixed size nk_text_edit struct, which has an internal undo/redo stack.
|
||||
This is mainly useful if you want something more like a text editor but don't want
|
||||
to have a dynamically growing buffer.
|
||||
The final way is using a dynamically growing nk_text_edit struct, which
|
||||
has both a default version if you don't care where memory comes from and an
|
||||
allocator version if you do. While the text editor is quite powerful for its
|
||||
complexity I would not recommend editing gigabytes of data with it.
|
||||
It is rather designed for uses cases which make sense for a GUI library not for
|
||||
an full blown text editor.
|
||||
### Drawing
|
||||
This library was designed to be render backend agnostic so it does
|
||||
not draw anything to screen. Instead all drawn shapes, widgets
|
||||
are made of, are buffered into memory and make up a command queue.
|
||||
Each frame therefore fills the command buffer with draw commands
|
||||
that then need to be executed by the user and his own render backend.
|
||||
After that the command buffer needs to be cleared and a new frame can be
|
||||
started. It is probably important to note that the command buffer is the main
|
||||
drawing API and the optional vertex buffer API only takes this format and
|
||||
converts it into a hardware accessible format.
|
||||
|
||||
To use the command queue to draw your own widgets you can access the
|
||||
command buffer of each window by calling `nk_window_get_canvas` after
|
||||
previously having called `nk_begin`:
|
||||
|
||||
```c
|
||||
void draw_red_rectangle_widget(struct nk_context *ctx)
|
||||
{
|
||||
struct nk_command_buffer *canvas;
|
||||
struct nk_input *input = &ctx->input;
|
||||
canvas = nk_window_get_canvas(ctx);
|
||||
|
||||
struct nk_rect space;
|
||||
enum nk_widget_layout_states state;
|
||||
state = nk_widget(&space, ctx);
|
||||
if (!state) return;
|
||||
|
||||
if (state != NK_WIDGET_ROM)
|
||||
update_your_widget_by_user_input(...);
|
||||
nk_fill_rect(canvas, space, 0, nk_rgb(255,0,0));
|
||||
}
|
||||
|
||||
if (nk_begin(...)) {
|
||||
nk_layout_row_dynamic(ctx, 25, 1);
|
||||
draw_red_rectangle_widget(ctx);
|
||||
}
|
||||
nk_end(..)
|
||||
|
||||
```
|
||||
Important to know if you want to create your own widgets is the `nk_widget`
|
||||
call. It allocates space on the panel reserved for this widget to be used,
|
||||
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
|
||||
to be drawn the state will be `NK_WIDGET_ROM` otherwise you can do both
|
||||
update and draw your widget. The reason for separating is to only draw and
|
||||
update what is actually necessary which is crucial for performance.
|
||||
Draw List
|
||||
The optional vertex buffer draw list provides a 2D drawing context
|
||||
with antialiasing functionality which takes basic filled or outlined shapes
|
||||
or a path and outputs vertexes, elements and draw commands.
|
||||
The actual draw list API is not required to be used directly while using this
|
||||
library since converting the default library draw command output is done by
|
||||
just calling `nk_convert` but I decided to still make this library accessible
|
||||
since it can be useful.
|
||||
|
||||
The draw list is based on a path buffering and polygon and polyline
|
||||
rendering API which allows a lot of ways to draw 2D content to screen.
|
||||
In fact it is probably more powerful than needed but allows even more crazy
|
||||
things than this library provides by default.
|
||||
### Stack
|
||||
The style modifier stack can be used to temporarily change a
|
||||
property inside `nk_style`. For example if you want a special
|
||||
red button you can temporarily push the old button color onto a stack
|
||||
draw the button with a red color and then you just pop the old color
|
||||
back from the stack:
|
||||
|
||||
nk_style_push_style_item(ctx, &ctx->style.button.normal, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
nk_style_push_style_item(ctx, &ctx->style.button.hover, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
nk_style_push_style_item(ctx, &ctx->style.button.active, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
nk_style_push_vec2(ctx, &cx->style.button.padding, nk_vec2(2,2));
|
||||
|
||||
nk_button(...);
|
||||
|
||||
nk_style_pop_style_item(ctx);
|
||||
nk_style_pop_style_item(ctx);
|
||||
nk_style_pop_style_item(ctx);
|
||||
nk_style_pop_vec2(ctx);
|
||||
|
||||
Nuklear has a stack for style_items, float properties, vector properties,
|
||||
flags, colors, fonts and for button_behavior. Each has it's own fixed size stack
|
||||
which can be changed at compile time.
|
||||
### Math
|
||||
Since nuklear is supposed to work on all systems providing floating point
|
||||
math without any dependencies I also had to implement my own math functions
|
||||
for sqrt, sin and cos. Since the actual highly accurate implementations for
|
||||
the standard library functions are quite complex and I do not need high
|
||||
precision for my use cases I use approximations.
|
||||
Sqrt
|
||||
----
|
||||
For square root nuklear uses the famous fast inverse square root:
|
||||
https://en.wikipedia.org/wiki/Fast_inverse_square_root with
|
||||
slightly tweaked magic constant. While on today's hardware it is
|
||||
probably not faster it is still fast and accurate enough for
|
||||
nuklear's use cases. IMPORTANT: this requires float format IEEE 754
|
||||
Sine/Cosine
|
||||
-----------
|
||||
All constants inside both function are generated Remez's minimax
|
||||
approximations for value range 0...2*PI. The reason why I decided to
|
||||
approximate exactly that range is that nuklear only needs sine and
|
||||
cosine to generate circles which only requires that exact range.
|
||||
In addition I used Remez instead of Taylor for additional precision:
|
||||
www.lolengine.net/blog/2011/12/21/better-function-approximations.
|
||||
The tool I used to generate constants for both sine and cosine
|
||||
(it can actually approximate a lot more functions) can be
|
||||
found here: www.lolengine.net/wiki/oss/lolremez
|
||||
-XXX.XXX- X...X - X...X -X....X - X....X"
|
||||
X...XXXXXXXXXXXXX...X - "
|
||||
## License
|
||||
|
|
@ -2306,13 +2612,55 @@ X...XXXXXXXXXXXXX...X - "
|
|||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
## Changelog
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none
|
||||
[date][x.yy.zz]-[description]
|
||||
-[date]: date on which the change has been pushed
|
||||
-[x.yy.zz]: Numerical version string representation. Each version number on the right
|
||||
resets back to zero if version on the left is incremented.
|
||||
- [x]: Major version with API and library breaking changes
|
||||
- [yy]: Minor version with non-breaking API and library changes
|
||||
- [zz]: Bug fix version with no direct changes to API
|
||||
[date] ([x.y.z]) - [description]
|
||||
- [date]: date on which the change has been pushed
|
||||
- [x.y.z]: Version string, represented in Semantic Versioning format
|
||||
- [x]: Major version with API and library breaking changes
|
||||
- [y]: Minor version with non-breaking API and library changes
|
||||
- [z]: Patch version with no direct changes to the API
|
||||
- 2022/12/17 (4.10.5) - Fix nk_font_bake_pack() using TTC font offset incorrectly
|
||||
- 2022/10/24 (4.10.4) - Fix nk_str_{append,insert}_str_utf8 always returning 0
|
||||
- 2022/09/03 (4.10.3) - Renamed the `null` texture variable to `tex_null`
|
||||
- 2022/08/01 (4.10.2) - Fix Apple Silicon with incorrect NK_SITE_TYPE and NK_POINTER_TYPE
|
||||
- 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than
|
||||
nk_edit_xxx limit
|
||||
- 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug
|
||||
- 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to
|
||||
only trigger when the mouse position was inside the same button on down
|
||||
- 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS
|
||||
- 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions
|
||||
- 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized
|
||||
- 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding
|
||||
- 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26
|
||||
- 2021/12/16 (4.09.1) - Fix the majority of GCC warnings
|
||||
- 2021/10/16 (4.09.0) - Added nk_spacer() widget
|
||||
- 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget
|
||||
- 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later
|
||||
- 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property
|
||||
- 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage"
|
||||
- 2021/09/08 (4.08.2) - Fix warnings in C89 builds
|
||||
- 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible
|
||||
- 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles
|
||||
- 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET
|
||||
- 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings
|
||||
- 2021/08/08 (4.07.3) - Fix crash when baking merged fonts
|
||||
- 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset
|
||||
- 2021/03/17 (4.07.1) - Fix warning about unused parameter
|
||||
- 2021/03/17 (4.07.0) - Fix nk_property hover bug
|
||||
- 2021/03/15 (4.06.4) - Change nk_propertyi back to int
|
||||
- 2021/03/15 (4.06.3) - Update documentation for functions that now return nk_bool
|
||||
- 2020/12/19 (4.06.2) - Fix additional C++ style comments which are not allowed in ISO C90.
|
||||
- 2020/10/11 (4.06.1) - Fix C++ style comments which are not allowed in ISO C90.
|
||||
- 2020/10/07 (4.06.0) - Fix nk_combo return type wrongly changed to nk_bool
|
||||
- 2020/09/05 (4.05.0) - Use the nk_font_atlas allocator for stb_truetype memory management.
|
||||
- 2020/09/04 (4.04.1) - Replace every boolean int by nk_bool
|
||||
- 2020/09/04 (4.04.0) - Add nk_bool with NK_INCLUDE_STANDARD_BOOL
|
||||
- 2020/06/13 (4.03.1) - Fix nk_pool allocation sizes.
|
||||
- 2020/06/04 (4.03.0) - Made nk_combo header symbols optional.
|
||||
- 2020/05/27 (4.02.5) - Fix nk_do_edit: Keep scroll position when re-activating edit widget.
|
||||
- 2020/05/09 (4.02.4) - Fix nk_menubar height calculation bug
|
||||
- 2020/05/08 (4.02.3) - Fix missing stdarg.h with NK_INCLUDE_STANDARD_VARARGS
|
||||
- 2020/04/30 (4.02.2) - Fix nk_edit border drawing bug
|
||||
- 2020/04/09 (4.02.1) - Removed unused nk_sqrt function to fix compiler warnings
|
||||
- Fixed compiler warnings if you bring your own methods for
|
||||
nk_cos/nk_sin/nk_strtod/nk_memset/nk_memcopy/nk_dtoa
|
||||
|
|
@ -2412,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.
|
||||
|
|
@ -2550,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
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@
|
|||
/// - [y]: Minor version with non-breaking API and library changes
|
||||
/// - [z]: Patch version with no direct changes to the API
|
||||
///
|
||||
/// - 2023/11/26 (4.12.0) - Added an alignment option to checkboxes and radio buttons.
|
||||
/// - 2023/10/11 (4.11.0) - Added nk_widget_disable_begin() and nk_widget_disable_end()
|
||||
/// - 2022/12/23 (4.10.6) - Fix incorrect glyph index in nk_font_bake()
|
||||
/// - 2022/12/17 (4.10.5) - Fix nk_font_bake_pack() using TTC font offset incorrectly
|
||||
/// - 2022/10/24 (4.10.4) - Fix nk_str_{append,insert}_str_utf8 always returning 0
|
||||
/// - 2022/09/03 (4.10.3) - Renamed the `null` texture variable to `tex_null`
|
||||
|
|
@ -14,6 +17,7 @@
|
|||
/// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than
|
||||
/// nk_edit_xxx limit
|
||||
/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug
|
||||
/// - 2022/04/19 (4.9.8) - Added nk_rule_horizontal() widget
|
||||
/// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to
|
||||
/// only trigger when the mouse position was inside the same button on down
|
||||
/// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS
|
||||
|
|
@ -149,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.
|
||||
|
|
@ -287,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
|
||||
|
|
|
|||
631
src/nuklear.h
631
src/nuklear.h
|
|
@ -151,7 +151,7 @@ extern "C" {
|
|||
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
|
||||
#define NK_SIZE_TYPE unsigned __int32
|
||||
#elif defined(__GNUC__) || defined(__clang__)
|
||||
#if defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__)
|
||||
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
|
||||
#define NK_SIZE_TYPE unsigned long
|
||||
#else
|
||||
#define NK_SIZE_TYPE unsigned int
|
||||
|
|
@ -166,7 +166,7 @@ extern "C" {
|
|||
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
|
||||
#define NK_POINTER_TYPE unsigned __int32
|
||||
#elif defined(__GNUC__) || defined(__clang__)
|
||||
#if defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__)
|
||||
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
|
||||
#define NK_POINTER_TYPE unsigned long
|
||||
#else
|
||||
#define NK_POINTER_TYPE unsigned int
|
||||
|
|
@ -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,9 +1779,22 @@ 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 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)
|
||||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
///
|
||||
/// Parameter | Description
|
||||
/// ----------------|-------------------------------------------------------
|
||||
/// __ctx__ | Must point to an previously initialized `nk_context` struct
|
||||
/// __color__ | Color of the horizontal line
|
||||
/// __rounding__ | Whether or not to make the line round
|
||||
*/
|
||||
NK_API void nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, nk_bool rounding);
|
||||
/* =============================================================================
|
||||
*
|
||||
* LAYOUT
|
||||
|
|
@ -1834,7 +1847,7 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
|
|||
/// 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
|
||||
|
|
@ -1932,7 +1945,7 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
|
|||
/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
|
||||
/// if (nk_begin_xxx(...) {
|
||||
/// // two rows with height: 30 composed of two widgets with width 60 and 40
|
||||
/// const float size[] = {60,40};
|
||||
/// const float ratio[] = {60,40};
|
||||
/// nk_layout_row(ctx, NK_STATIC, 30, 2, ratio);
|
||||
/// nk_widget(...);
|
||||
/// nk_widget(...);
|
||||
|
|
@ -2055,6 +2068,21 @@ NK_API void nk_window_show_if(struct nk_context*, const char *name, enum nk_show
|
|||
/// nk_layout_space_rect_to_screen | Converts rectangle from nk_layout_space coordinate space into screen space
|
||||
/// nk_layout_space_rect_to_local | Converts rectangle from screen space into nk_layout_space coordinates
|
||||
*/
|
||||
|
||||
enum nk_widget_align {
|
||||
NK_WIDGET_ALIGN_LEFT = 0x01,
|
||||
NK_WIDGET_ALIGN_CENTERED = 0x02,
|
||||
NK_WIDGET_ALIGN_RIGHT = 0x04,
|
||||
NK_WIDGET_ALIGN_TOP = 0x08,
|
||||
NK_WIDGET_ALIGN_MIDDLE = 0x10,
|
||||
NK_WIDGET_ALIGN_BOTTOM = 0x20
|
||||
};
|
||||
enum nk_widget_alignment {
|
||||
NK_WIDGET_LEFT = NK_WIDGET_ALIGN_MIDDLE|NK_WIDGET_ALIGN_LEFT,
|
||||
NK_WIDGET_CENTERED = NK_WIDGET_ALIGN_MIDDLE|NK_WIDGET_ALIGN_CENTERED,
|
||||
NK_WIDGET_RIGHT = NK_WIDGET_ALIGN_MIDDLE|NK_WIDGET_ALIGN_RIGHT
|
||||
};
|
||||
|
||||
/*/// #### nk_layout_set_min_row_height
|
||||
/// Sets the currently used minimum row height.
|
||||
/// !!! WARNING
|
||||
|
|
@ -2854,7 +2882,8 @@ NK_API void nk_list_view_end(struct nk_list_view*);
|
|||
enum nk_widget_layout_states {
|
||||
NK_WIDGET_INVALID, /* The widget cannot be seen and is completely out of view */
|
||||
NK_WIDGET_VALID, /* The widget is completely inside the window and can be updated and drawn */
|
||||
NK_WIDGET_ROM /* The widget is partially visible and cannot be updated */
|
||||
NK_WIDGET_ROM, /* The widget is partially visible and cannot be updated */
|
||||
NK_WIDGET_DISABLED /* The widget is manually disabled and acts like NK_WIDGET_ROM */
|
||||
};
|
||||
enum nk_widget_states {
|
||||
NK_WIDGET_STATE_MODIFIED = NK_FLAG(1),
|
||||
|
|
@ -2877,6 +2906,8 @@ NK_API nk_bool nk_widget_is_hovered(struct nk_context*);
|
|||
NK_API nk_bool nk_widget_is_mouse_clicked(struct nk_context*, enum nk_buttons);
|
||||
NK_API nk_bool nk_widget_has_mouse_click_down(struct nk_context*, enum nk_buttons, nk_bool down);
|
||||
NK_API void nk_spacing(struct nk_context*, int cols);
|
||||
NK_API void nk_widget_disable_begin(struct nk_context* ctx);
|
||||
NK_API void nk_widget_disable_end(struct nk_context* ctx);
|
||||
/* =============================================================================
|
||||
*
|
||||
* TEXT
|
||||
|
|
@ -2954,10 +2985,13 @@ NK_API nk_bool nk_button_pop_behavior(struct nk_context*);
|
|||
* ============================================================================= */
|
||||
NK_API nk_bool nk_check_label(struct nk_context*, const char*, nk_bool active);
|
||||
NK_API nk_bool nk_check_text(struct nk_context*, const char*, int, nk_bool active);
|
||||
NK_API nk_bool nk_check_text_align(struct nk_context*, const char*, int, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API unsigned nk_check_flags_label(struct nk_context*, const char*, unsigned int flags, unsigned int value);
|
||||
NK_API unsigned nk_check_flags_text(struct nk_context*, const char*, int, unsigned int flags, unsigned int value);
|
||||
NK_API nk_bool nk_checkbox_label(struct nk_context*, const char*, nk_bool *active);
|
||||
NK_API nk_bool nk_checkbox_label_align(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API nk_bool nk_checkbox_text(struct nk_context*, const char*, int, nk_bool *active);
|
||||
NK_API nk_bool nk_checkbox_text_align(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API nk_bool nk_checkbox_flags_label(struct nk_context*, const char*, unsigned int *flags, unsigned int value);
|
||||
NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsigned int *flags, unsigned int value);
|
||||
/* =============================================================================
|
||||
|
|
@ -2966,9 +3000,13 @@ NK_API nk_bool nk_checkbox_flags_text(struct nk_context*, const char*, int, unsi
|
|||
*
|
||||
* ============================================================================= */
|
||||
NK_API nk_bool nk_radio_label(struct nk_context*, const char*, nk_bool *active);
|
||||
NK_API nk_bool nk_radio_label_align(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API nk_bool nk_radio_text(struct nk_context*, const char*, int, nk_bool *active);
|
||||
NK_API nk_bool nk_radio_text_align(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API nk_bool nk_option_label(struct nk_context*, const char*, nk_bool active);
|
||||
NK_API nk_bool nk_option_label_align(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
NK_API nk_bool nk_option_text(struct nk_context*, const char*, int, nk_bool active);
|
||||
NK_API nk_bool nk_option_text_align(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
/* =============================================================================
|
||||
*
|
||||
* SELECTABLE
|
||||
|
|
@ -3371,6 +3409,9 @@ NK_API void nk_menu_end(struct nk_context*);
|
|||
* STYLE
|
||||
*
|
||||
* ============================================================================= */
|
||||
|
||||
#define NK_WIDGET_DISABLED_FACTOR 0.5f
|
||||
|
||||
enum nk_style_colors {
|
||||
NK_COLOR_TEXT,
|
||||
NK_COLOR_WINDOW,
|
||||
|
|
@ -3447,6 +3488,7 @@ NK_API struct nk_color nk_rgb_f(float r, float g, float b);
|
|||
NK_API struct nk_color nk_rgb_fv(const float *rgb);
|
||||
NK_API struct nk_color nk_rgb_cf(struct nk_colorf c);
|
||||
NK_API struct nk_color nk_rgb_hex(const char *rgb);
|
||||
NK_API struct nk_color nk_rgb_factor(struct nk_color col, const float factor);
|
||||
|
||||
NK_API struct nk_color nk_rgba(int r, int g, int b, int a);
|
||||
NK_API struct nk_color nk_rgba_u32(nk_uint);
|
||||
|
|
@ -3576,149 +3618,155 @@ NK_API const char* nk_utf_at(const char *buffer, int length, int index, nk_rune
|
|||
* FONT
|
||||
*
|
||||
* ===============================================================*/
|
||||
/* Font handling in this library was designed to be quite customizable and lets
|
||||
you decide what you want to use and what you want to provide. There are three
|
||||
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
|
||||
slightly more advanced features is font handling with vertex buffer output.
|
||||
Finally the most complex API wise is using nuklear's font baking API.
|
||||
|
||||
1.) Using your own implementation without vertex buffer output
|
||||
--------------------------------------------------------------
|
||||
So first up the easiest way to do font handling is by just providing a
|
||||
`nk_user_font` struct which only requires the height in pixel of the used
|
||||
font and a callback to calculate the width of a string. This way of handling
|
||||
fonts is best fitted for using the normal draw shape command API where you
|
||||
do all the text drawing yourself and the library does not require any kind
|
||||
of deeper knowledge about which font handling mechanism you use.
|
||||
IMPORTANT: the `nk_user_font` pointer provided to nuklear has to persist
|
||||
over the complete life time! I know this sucks but it is currently the only
|
||||
way to switch between fonts.
|
||||
|
||||
float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
float text_width = ...;
|
||||
return text_width;
|
||||
}
|
||||
|
||||
struct nk_user_font font;
|
||||
font.userdata.ptr = &your_font_class_or_struct;
|
||||
font.height = your_font_height;
|
||||
font.width = your_text_width_calculation;
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font);
|
||||
|
||||
2.) Using your own implementation with vertex buffer output
|
||||
--------------------------------------------------------------
|
||||
While the first approach works fine if you don't want to use the optional
|
||||
vertex buffer output it is not enough if you do. To get font handling working
|
||||
for these cases you have to provide two additional parameters inside the
|
||||
`nk_user_font`. First a texture atlas handle used to draw text as subimages
|
||||
of a bigger font atlas texture and a callback to query a character's glyph
|
||||
information (offset, size, ...). So it is still possible to provide your own
|
||||
font and use the vertex buffer output.
|
||||
|
||||
float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
float text_width = ...;
|
||||
return text_width;
|
||||
}
|
||||
void query_your_font_glyph(nk_handle handle, float font_height, struct nk_user_font_glyph *glyph, nk_rune codepoint, nk_rune next_codepoint)
|
||||
{
|
||||
your_font_type *type = handle.ptr;
|
||||
glyph.width = ...;
|
||||
glyph.height = ...;
|
||||
glyph.xadvance = ...;
|
||||
glyph.uv[0].x = ...;
|
||||
glyph.uv[0].y = ...;
|
||||
glyph.uv[1].x = ...;
|
||||
glyph.uv[1].y = ...;
|
||||
glyph.offset.x = ...;
|
||||
glyph.offset.y = ...;
|
||||
}
|
||||
|
||||
struct nk_user_font font;
|
||||
font.userdata.ptr = &your_font_class_or_struct;
|
||||
font.height = your_font_height;
|
||||
font.width = your_text_width_calculation;
|
||||
font.query = query_your_font_glyph;
|
||||
font.texture.id = your_font_texture;
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font);
|
||||
|
||||
3.) Nuklear font baker
|
||||
------------------------------------
|
||||
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.
|
||||
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.
|
||||
|
||||
It still uses the `nk_user_font` struct and the two different approaches
|
||||
previously stated still work. The font baker is not located inside
|
||||
`nk_context` like all other systems since it can be understood as more of
|
||||
an extension to nuklear and does not really depend on any `nk_context` state.
|
||||
|
||||
Font baker need to be initialized first by one of the nk_font_atlas_init_xxx
|
||||
functions. If you don't care about memory just call the default version
|
||||
`nk_font_atlas_init_default` which will allocate all memory from the standard library.
|
||||
If you want to control memory allocation but you don't care if the allocated
|
||||
memory is temporary and therefore can be freed directly after the baking process
|
||||
is over or permanent you can call `nk_font_atlas_init`.
|
||||
|
||||
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`.
|
||||
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
|
||||
the font baker by for example adding additional fonts you can call
|
||||
`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
|
||||
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
|
||||
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
|
||||
will free all temporary memory including the font atlas image so make sure
|
||||
you created our texture beforehand. `nk_font_atlas_end` requires a handle
|
||||
to your font texture or object and optionally fills a `struct nk_draw_null_texture`
|
||||
which can be used for the optional vertex output. If you don't want it just
|
||||
set the argument to `NULL`.
|
||||
|
||||
At this point you are done and if you don't want to reuse the font atlas you
|
||||
can call `nk_font_atlas_cleanup` to free all truetype blobs and configuration
|
||||
memory. Finally if you don't use the font atlas and any of it's fonts anymore
|
||||
you need to call `nk_font_atlas_clear` to free all memory still being used.
|
||||
|
||||
struct nk_font_atlas atlas;
|
||||
nk_font_atlas_init_default(&atlas);
|
||||
nk_font_atlas_begin(&atlas);
|
||||
nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, 0);
|
||||
nk_font *font2 = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font2.ttf", 16, 0);
|
||||
const void* img = nk_font_atlas_bake(&atlas, &img_width, &img_height, NK_FONT_ATLAS_RGBA32);
|
||||
nk_font_atlas_end(&atlas, nk_handle_id(texture), 0);
|
||||
|
||||
struct nk_context ctx;
|
||||
nk_init_default(&ctx, &font->handle);
|
||||
while (1) {
|
||||
|
||||
}
|
||||
nk_font_atlas_clear(&atlas);
|
||||
|
||||
The font baker API is probably the most complex API inside this library and
|
||||
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
|
||||
how to merge fonts, configure a font with `nk_font_config` to use other languages,
|
||||
use another texture coordinate format and a lot more:
|
||||
|
||||
struct nk_font_config cfg = nk_font_config(font_pixel_height);
|
||||
cfg.merge_mode = nk_false or nk_true;
|
||||
cfg.range = nk_font_korean_glyph_ranges();
|
||||
cfg.coord_type = NK_COORD_PIXEL;
|
||||
nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, &cfg);
|
||||
|
||||
/*/// ### Font
|
||||
/// Font handling in this library was designed to be quite customizable and lets
|
||||
/// you decide what you want to use and what you want to provide. There are three
|
||||
/// 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
|
||||
/// slightly more advanced features is font handling with vertex buffer output.
|
||||
/// Finally the most complex API wise is using nuklear's font baking API.
|
||||
//
|
||||
/// #### Using your own implementation without vertex buffer output
|
||||
///
|
||||
/// So first up the easiest way to do font handling is by just providing a
|
||||
/// `nk_user_font` struct which only requires the height in pixel of the used
|
||||
/// font and a callback to calculate the width of a string. This way of handling
|
||||
/// fonts is best fitted for using the normal draw shape command API where you
|
||||
/// do all the text drawing yourself and the library does not require any kind
|
||||
/// of deeper knowledge about which font handling mechanism you use.
|
||||
/// IMPORTANT: the `nk_user_font` pointer provided to nuklear has to persist
|
||||
/// over the complete life time! I know this sucks but it is currently the only
|
||||
/// way to switch between fonts.
|
||||
///
|
||||
/// ```c
|
||||
/// float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
/// {
|
||||
/// your_font_type *type = handle.ptr;
|
||||
/// float text_width = ...;
|
||||
/// return text_width;
|
||||
/// }
|
||||
///
|
||||
/// struct nk_user_font font;
|
||||
/// font.userdata.ptr = &your_font_class_or_struct;
|
||||
/// font.height = your_font_height;
|
||||
/// font.width = your_text_width_calculation;
|
||||
///
|
||||
/// struct nk_context ctx;
|
||||
/// nk_init_default(&ctx, &font);
|
||||
/// ```
|
||||
/// #### Using your own implementation with vertex buffer output
|
||||
///
|
||||
/// While the first approach works fine if you don't want to use the optional
|
||||
/// vertex buffer output it is not enough if you do. To get font handling working
|
||||
/// for these cases you have to provide two additional parameters inside the
|
||||
/// `nk_user_font`. First a texture atlas handle used to draw text as subimages
|
||||
/// of a bigger font atlas texture and a callback to query a character's glyph
|
||||
/// information (offset, size, ...). So it is still possible to provide your own
|
||||
/// font and use the vertex buffer output.
|
||||
///
|
||||
/// ```c
|
||||
/// float your_text_width_calculation(nk_handle handle, float height, const char *text, int len)
|
||||
/// {
|
||||
/// your_font_type *type = handle.ptr;
|
||||
/// float text_width = ...;
|
||||
/// return text_width;
|
||||
/// }
|
||||
/// void query_your_font_glyph(nk_handle handle, float font_height, struct nk_user_font_glyph *glyph, nk_rune codepoint, nk_rune next_codepoint)
|
||||
/// {
|
||||
/// your_font_type *type = handle.ptr;
|
||||
/// glyph.width = ...;
|
||||
/// glyph.height = ...;
|
||||
/// glyph.xadvance = ...;
|
||||
/// glyph.uv[0].x = ...;
|
||||
/// glyph.uv[0].y = ...;
|
||||
/// glyph.uv[1].x = ...;
|
||||
/// glyph.uv[1].y = ...;
|
||||
/// glyph.offset.x = ...;
|
||||
/// glyph.offset.y = ...;
|
||||
/// }
|
||||
///
|
||||
/// struct nk_user_font font;
|
||||
/// font.userdata.ptr = &your_font_class_or_struct;
|
||||
/// font.height = your_font_height;
|
||||
/// font.width = your_text_width_calculation;
|
||||
/// font.query = query_your_font_glyph;
|
||||
/// font.texture.id = your_font_texture;
|
||||
///
|
||||
/// struct nk_context ctx;
|
||||
/// nk_init_default(&ctx, &font);
|
||||
/// ```
|
||||
///
|
||||
/// #### Nuklear font baker
|
||||
///
|
||||
/// 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.
|
||||
/// 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.
|
||||
///
|
||||
/// It still uses the `nk_user_font` struct and the two different approaches
|
||||
/// previously stated still work. The font baker is not located inside
|
||||
/// `nk_context` like all other systems since it can be understood as more of
|
||||
/// an extension to nuklear and does not really depend on any `nk_context` state.
|
||||
///
|
||||
/// Font baker need to be initialized first by one of the nk_font_atlas_init_xxx
|
||||
/// functions. If you don't care about memory just call the default version
|
||||
/// `nk_font_atlas_init_default` which will allocate all memory from the standard library.
|
||||
/// If you want to control memory allocation but you don't care if the allocated
|
||||
/// memory is temporary and therefore can be freed directly after the baking process
|
||||
/// is over or permanent you can call `nk_font_atlas_init`.
|
||||
///
|
||||
/// 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`.
|
||||
/// 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
|
||||
/// the font baker by for example adding additional fonts you can call
|
||||
/// `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
|
||||
/// 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
|
||||
/// 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
|
||||
/// will free all temporary memory including the font atlas image so make sure
|
||||
/// you created our texture beforehand. `nk_font_atlas_end` requires a handle
|
||||
/// to your font texture or object and optionally fills a `struct nk_draw_null_texture`
|
||||
/// which can be used for the optional vertex output. If you don't want it just
|
||||
/// set the argument to `NULL`.
|
||||
///
|
||||
/// At this point you are done and if you don't want to reuse the font atlas you
|
||||
/// can call `nk_font_atlas_cleanup` to free all truetype blobs and configuration
|
||||
/// memory. Finally if you don't use the font atlas and any of it's fonts anymore
|
||||
/// you need to call `nk_font_atlas_clear` to free all memory still being used.
|
||||
///
|
||||
/// ```c
|
||||
/// struct nk_font_atlas atlas;
|
||||
/// nk_font_atlas_init_default(&atlas);
|
||||
/// nk_font_atlas_begin(&atlas);
|
||||
/// nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, 0);
|
||||
/// nk_font *font2 = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font2.ttf", 16, 0);
|
||||
/// const void* img = nk_font_atlas_bake(&atlas, &img_width, &img_height, NK_FONT_ATLAS_RGBA32);
|
||||
/// nk_font_atlas_end(&atlas, nk_handle_id(texture), 0);
|
||||
///
|
||||
/// struct nk_context ctx;
|
||||
/// nk_init_default(&ctx, &font->handle);
|
||||
/// while (1) {
|
||||
///
|
||||
/// }
|
||||
/// nk_font_atlas_clear(&atlas);
|
||||
/// ```
|
||||
/// The font baker API is probably the most complex API inside this library and
|
||||
/// 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
|
||||
/// how to merge fonts, configure a font with `nk_font_config` to use other languages,
|
||||
/// use another texture coordinate format and a lot more:
|
||||
///
|
||||
/// ```c
|
||||
/// struct nk_font_config cfg = nk_font_config(font_pixel_height);
|
||||
/// cfg.merge_mode = nk_false or nk_true;
|
||||
/// cfg.range = nk_font_korean_glyph_ranges();
|
||||
/// cfg.coord_type = NK_COORD_PIXEL;
|
||||
/// nk_font *font = nk_font_atlas_add_from_file(&atlas, "Path/To/Your/TTF_Font.ttf", 13, &cfg);
|
||||
/// ```
|
||||
*/
|
||||
struct nk_user_font_glyph;
|
||||
typedef float(*nk_text_width_f)(nk_handle, float h, const char*, int len);
|
||||
|
|
@ -3889,33 +3937,34 @@ NK_API void nk_font_atlas_clear(struct nk_font_atlas*);
|
|||
* MEMORY BUFFER
|
||||
*
|
||||
* ===============================================================*/
|
||||
/* A basic (double)-buffer with linear allocation and resetting as only
|
||||
freeing policy. The buffer's main purpose is to control all memory management
|
||||
inside the GUI toolkit and still leave memory control as much as possible in
|
||||
the hand of the user while also making sure the library is easy to use if
|
||||
not as much control is needed.
|
||||
In general all memory inside this library can be provided from the user in
|
||||
three different ways.
|
||||
|
||||
The first way and the one providing most control is by just passing a fixed
|
||||
size memory block. In this case all control lies in the hand of the user
|
||||
since he can exactly control where the memory comes from and how much memory
|
||||
the library should consume. Of course using the fixed size API removes the
|
||||
ability to automatically resize a buffer if not enough memory is provided so
|
||||
you have to take over the resizing. While being a fixed sized buffer sounds
|
||||
quite limiting, it is very effective in this library since the actual memory
|
||||
consumption is quite stable and has a fixed upper bound for a lot of cases.
|
||||
|
||||
If you don't want to think about how much memory the library should allocate
|
||||
at all time or have a very dynamic UI with unpredictable memory consumption
|
||||
habits but still want control over memory allocation you can use the dynamic
|
||||
allocator based API. The allocator consists of two callbacks for allocating
|
||||
and freeing memory and optional userdata so you can plugin your own allocator.
|
||||
|
||||
The final and easiest way can be used by defining
|
||||
NK_INCLUDE_DEFAULT_ALLOCATOR which uses the standard library memory
|
||||
allocation functions malloc and free and takes over complete control over
|
||||
memory in this library.
|
||||
/*/// ### Memory Buffer
|
||||
/// A basic (double)-buffer with linear allocation and resetting as only
|
||||
/// freeing policy. The buffer's main purpose is to control all memory management
|
||||
/// inside the GUI toolkit and still leave memory control as much as possible in
|
||||
/// the hand of the user while also making sure the library is easy to use if
|
||||
/// not as much control is needed.
|
||||
/// In general all memory inside this library can be provided from the user in
|
||||
/// three different ways.
|
||||
///
|
||||
/// The first way and the one providing most control is by just passing a fixed
|
||||
/// size memory block. In this case all control lies in the hand of the user
|
||||
/// since he can exactly control where the memory comes from and how much memory
|
||||
/// the library should consume. Of course using the fixed size API removes the
|
||||
/// ability to automatically resize a buffer if not enough memory is provided so
|
||||
/// you have to take over the resizing. While being a fixed sized buffer sounds
|
||||
/// quite limiting, it is very effective in this library since the actual memory
|
||||
/// consumption is quite stable and has a fixed upper bound for a lot of cases.
|
||||
///
|
||||
/// If you don't want to think about how much memory the library should allocate
|
||||
/// at all time or have a very dynamic UI with unpredictable memory consumption
|
||||
/// habits but still want control over memory allocation you can use the dynamic
|
||||
/// allocator based API. The allocator consists of two callbacks for allocating
|
||||
/// and freeing memory and optional userdata so you can plugin your own allocator.
|
||||
///
|
||||
/// The final and easiest way can be used by defining
|
||||
/// NK_INCLUDE_DEFAULT_ALLOCATOR which uses the standard library memory
|
||||
/// allocation functions malloc and free and takes over complete control over
|
||||
/// memory in this library.
|
||||
*/
|
||||
struct nk_memory_status {
|
||||
void *memory;
|
||||
|
|
@ -4040,28 +4089,29 @@ NK_API int nk_str_len_char(struct nk_str*);
|
|||
* TEXT EDITOR
|
||||
*
|
||||
* ===============================================================*/
|
||||
/* Editing text in this library is handled by either `nk_edit_string` or
|
||||
* `nk_edit_buffer`. But like almost everything in this library there are multiple
|
||||
* ways of doing it and a balance between control and ease of use with memory
|
||||
* as well as functionality controlled by flags.
|
||||
*
|
||||
* This library generally allows three different levels of memory control:
|
||||
* 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
|
||||
* user text input. Main upside is complete control over memory while the biggest
|
||||
* 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
|
||||
* a fixed size nk_text_edit struct, which has an internal undo/redo stack.
|
||||
* This is mainly useful if you want something more like a text editor but don't want
|
||||
* to have a dynamically growing buffer.
|
||||
*
|
||||
* The final way is using a dynamically growing nk_text_edit struct, which
|
||||
* has both a default version if you don't care where memory comes from and an
|
||||
* allocator version if you do. While the text editor is quite powerful for its
|
||||
* complexity I would not recommend editing gigabytes of data with it.
|
||||
* It is rather designed for uses cases which make sense for a GUI library not for
|
||||
* an full blown text editor.
|
||||
/*/// ### Text Editor
|
||||
/// Editing text in this library is handled by either `nk_edit_string` or
|
||||
/// `nk_edit_buffer`. But like almost everything in this library there are multiple
|
||||
/// ways of doing it and a balance between control and ease of use with memory
|
||||
/// as well as functionality controlled by flags.
|
||||
///
|
||||
/// This library generally allows three different levels of memory control:
|
||||
/// 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
|
||||
/// user text input. Main upside is complete control over memory while the biggest
|
||||
/// 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
|
||||
/// a fixed size nk_text_edit struct, which has an internal undo/redo stack.
|
||||
/// This is mainly useful if you want something more like a text editor but don't want
|
||||
/// to have a dynamically growing buffer.
|
||||
///
|
||||
/// The final way is using a dynamically growing nk_text_edit struct, which
|
||||
/// has both a default version if you don't care where memory comes from and an
|
||||
/// allocator version if you do. While the text editor is quite powerful for its
|
||||
/// complexity I would not recommend editing gigabytes of data with it.
|
||||
/// It is rather designed for uses cases which make sense for a GUI library not for
|
||||
/// an full blown text editor.
|
||||
*/
|
||||
#ifndef NK_TEXTEDIT_UNDOSTATECOUNT
|
||||
#define NK_TEXTEDIT_UNDOSTATECOUNT 99
|
||||
|
|
@ -4155,49 +4205,52 @@ NK_API void nk_textedit_redo(struct nk_text_edit*);
|
|||
* DRAWING
|
||||
*
|
||||
* ===============================================================*/
|
||||
/* This library was designed to be render backend agnostic so it does
|
||||
not draw anything to screen. Instead all drawn shapes, widgets
|
||||
are made of, are buffered into memory and make up a command queue.
|
||||
Each frame therefore fills the command buffer with draw commands
|
||||
that then need to be executed by the user and his own render backend.
|
||||
After that the command buffer needs to be cleared and a new frame can be
|
||||
started. It is probably important to note that the command buffer is the main
|
||||
drawing API and the optional vertex buffer API only takes this format and
|
||||
converts it into a hardware accessible format.
|
||||
|
||||
To use the command queue to draw your own widgets you can access the
|
||||
command buffer of each window by calling `nk_window_get_canvas` after
|
||||
previously having called `nk_begin`:
|
||||
|
||||
void draw_red_rectangle_widget(struct nk_context *ctx)
|
||||
{
|
||||
struct nk_command_buffer *canvas;
|
||||
struct nk_input *input = &ctx->input;
|
||||
canvas = nk_window_get_canvas(ctx);
|
||||
|
||||
struct nk_rect space;
|
||||
enum nk_widget_layout_states state;
|
||||
state = nk_widget(&space, ctx);
|
||||
if (!state) return;
|
||||
|
||||
if (state != NK_WIDGET_ROM)
|
||||
update_your_widget_by_user_input(...);
|
||||
nk_fill_rect(canvas, space, 0, nk_rgb(255,0,0));
|
||||
}
|
||||
|
||||
if (nk_begin(...)) {
|
||||
nk_layout_row_dynamic(ctx, 25, 1);
|
||||
draw_red_rectangle_widget(ctx);
|
||||
}
|
||||
nk_end(..)
|
||||
|
||||
Important to know if you want to create your own widgets is the `nk_widget`
|
||||
call. It allocates space on the panel reserved for this widget to be used,
|
||||
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
|
||||
to be drawn the state will be `NK_WIDGET_ROM` otherwise you can do both
|
||||
update and draw your widget. The reason for separating is to only draw and
|
||||
update what is actually necessary which is crucial for performance.
|
||||
/*/// ### Drawing
|
||||
/// This library was designed to be render backend agnostic so it does
|
||||
/// not draw anything to screen. Instead all drawn shapes, widgets
|
||||
/// are made of, are buffered into memory and make up a command queue.
|
||||
/// Each frame therefore fills the command buffer with draw commands
|
||||
/// that then need to be executed by the user and his own render backend.
|
||||
/// After that the command buffer needs to be cleared and a new frame can be
|
||||
/// started. It is probably important to note that the command buffer is the main
|
||||
/// drawing API and the optional vertex buffer API only takes this format and
|
||||
/// converts it into a hardware accessible format.
|
||||
///
|
||||
/// To use the command queue to draw your own widgets you can access the
|
||||
/// command buffer of each window by calling `nk_window_get_canvas` after
|
||||
/// previously having called `nk_begin`:
|
||||
///
|
||||
/// ```c
|
||||
/// void draw_red_rectangle_widget(struct nk_context *ctx)
|
||||
/// {
|
||||
/// struct nk_command_buffer *canvas;
|
||||
/// struct nk_input *input = &ctx->input;
|
||||
/// canvas = nk_window_get_canvas(ctx);
|
||||
///
|
||||
/// struct nk_rect space;
|
||||
/// enum nk_widget_layout_states state;
|
||||
/// state = nk_widget(&space, ctx);
|
||||
/// if (!state) return;
|
||||
///
|
||||
/// if (state != NK_WIDGET_ROM)
|
||||
/// update_your_widget_by_user_input(...);
|
||||
/// nk_fill_rect(canvas, space, 0, nk_rgb(255,0,0));
|
||||
/// }
|
||||
///
|
||||
/// if (nk_begin(...)) {
|
||||
/// nk_layout_row_dynamic(ctx, 25, 1);
|
||||
/// draw_red_rectangle_widget(ctx);
|
||||
/// }
|
||||
/// nk_end(..)
|
||||
///
|
||||
/// ```
|
||||
/// Important to know if you want to create your own widgets is the `nk_widget`
|
||||
/// call. It allocates space on the panel reserved for this widget to be used,
|
||||
/// 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
|
||||
/// to be drawn the state will be `NK_WIDGET_ROM` otherwise you can do both
|
||||
/// update and draw your widget. The reason for separating is to only draw and
|
||||
/// update what is actually necessary which is crucial for performance.
|
||||
*/
|
||||
enum nk_command_type {
|
||||
NK_COMMAND_NOP,
|
||||
|
|
@ -4482,18 +4535,19 @@ NK_API nk_bool nk_input_is_key_down(const struct nk_input*, enum nk_keys);
|
|||
*
|
||||
* ===============================================================*/
|
||||
#ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT
|
||||
/* The optional vertex buffer draw list provides a 2D drawing context
|
||||
with antialiasing functionality which takes basic filled or outlined shapes
|
||||
or a path and outputs vertexes, elements and draw commands.
|
||||
The actual draw list API is not required to be used directly while using this
|
||||
library since converting the default library draw command output is done by
|
||||
just calling `nk_convert` but I decided to still make this library accessible
|
||||
since it can be useful.
|
||||
|
||||
The draw list is based on a path buffering and polygon and polyline
|
||||
rendering API which allows a lot of ways to draw 2D content to screen.
|
||||
In fact it is probably more powerful than needed but allows even more crazy
|
||||
things than this library provides by default.
|
||||
/* ### Draw List
|
||||
/// The optional vertex buffer draw list provides a 2D drawing context
|
||||
/// with antialiasing functionality which takes basic filled or outlined shapes
|
||||
/// or a path and outputs vertexes, elements and draw commands.
|
||||
/// The actual draw list API is not required to be used directly while using this
|
||||
/// library since converting the default library draw command output is done by
|
||||
/// just calling `nk_convert` but I decided to still make this library accessible
|
||||
/// since it can be useful.
|
||||
///
|
||||
/// The draw list is based on a path buffering and polygon and polyline
|
||||
/// rendering API which allows a lot of ways to draw 2D content to screen.
|
||||
/// In fact it is probably more powerful than needed but allows even more crazy
|
||||
/// things than this library provides by default.
|
||||
*/
|
||||
#ifdef NK_UINT_DRAW_INDEX
|
||||
typedef nk_uint nk_draw_index;
|
||||
|
|
@ -4655,6 +4709,8 @@ struct nk_style_item {
|
|||
struct nk_style_text {
|
||||
struct nk_color color;
|
||||
struct nk_vec2 padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
};
|
||||
|
||||
struct nk_style_button {
|
||||
|
|
@ -4663,6 +4719,7 @@ struct nk_style_button {
|
|||
struct nk_style_item hover;
|
||||
struct nk_style_item active;
|
||||
struct nk_color border_color;
|
||||
float color_factor_background;
|
||||
|
||||
/* text */
|
||||
struct nk_color text_background;
|
||||
|
|
@ -4670,6 +4727,7 @@ struct nk_style_button {
|
|||
struct nk_color text_hover;
|
||||
struct nk_color text_active;
|
||||
nk_flags text_alignment;
|
||||
float color_factor_text;
|
||||
|
||||
/* properties */
|
||||
float border;
|
||||
|
|
@ -4677,6 +4735,7 @@ struct nk_style_button {
|
|||
struct nk_vec2 padding;
|
||||
struct nk_vec2 image_padding;
|
||||
struct nk_vec2 touch_padding;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional user callbacks */
|
||||
nk_handle userdata;
|
||||
|
|
@ -4707,6 +4766,8 @@ struct nk_style_toggle {
|
|||
struct nk_vec2 touch_padding;
|
||||
float spacing;
|
||||
float border;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional user callbacks */
|
||||
nk_handle userdata;
|
||||
|
|
@ -4742,6 +4803,8 @@ struct nk_style_selectable {
|
|||
struct nk_vec2 padding;
|
||||
struct nk_vec2 touch_padding;
|
||||
struct nk_vec2 image_padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional user callbacks */
|
||||
nk_handle userdata;
|
||||
|
|
@ -4774,6 +4837,8 @@ struct nk_style_slider {
|
|||
struct nk_vec2 padding;
|
||||
struct nk_vec2 spacing;
|
||||
struct nk_vec2 cursor_size;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional buttons */
|
||||
int show_buttons;
|
||||
|
|
@ -4807,6 +4872,8 @@ struct nk_style_progress {
|
|||
float cursor_border;
|
||||
float cursor_rounding;
|
||||
struct nk_vec2 padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional user callbacks */
|
||||
nk_handle userdata;
|
||||
|
|
@ -4833,6 +4900,8 @@ struct nk_style_scrollbar {
|
|||
float border_cursor;
|
||||
float rounding_cursor;
|
||||
struct nk_vec2 padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
/* optional buttons */
|
||||
int show_buttons;
|
||||
|
|
@ -4879,6 +4948,8 @@ struct nk_style_edit {
|
|||
struct nk_vec2 scrollbar_size;
|
||||
struct nk_vec2 padding;
|
||||
float row_padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
};
|
||||
|
||||
struct nk_style_property {
|
||||
|
|
@ -4901,6 +4972,8 @@ struct nk_style_property {
|
|||
float border;
|
||||
float rounding;
|
||||
struct nk_vec2 padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
|
||||
struct nk_style_edit edit;
|
||||
struct nk_style_button inc_button;
|
||||
|
|
@ -4923,6 +4996,8 @@ struct nk_style_chart {
|
|||
float border;
|
||||
float rounding;
|
||||
struct nk_vec2 padding;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
};
|
||||
|
||||
struct nk_style_combo {
|
||||
|
|
@ -4954,6 +5029,8 @@ struct nk_style_combo {
|
|||
struct nk_vec2 content_padding;
|
||||
struct nk_vec2 button_padding;
|
||||
struct nk_vec2 spacing;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
};
|
||||
|
||||
struct nk_style_tab {
|
||||
|
|
@ -4976,6 +5053,8 @@ struct nk_style_tab {
|
|||
float indent;
|
||||
struct nk_vec2 padding;
|
||||
struct nk_vec2 spacing;
|
||||
float color_factor;
|
||||
float disabled_factor;
|
||||
};
|
||||
|
||||
enum nk_style_header_align {
|
||||
|
|
@ -5258,6 +5337,7 @@ struct nk_window {
|
|||
struct nk_popup_state popup;
|
||||
struct nk_edit_state edit;
|
||||
unsigned int scrolled;
|
||||
nk_bool widgets_disabled;
|
||||
|
||||
struct nk_table *tables;
|
||||
unsigned int table_count;
|
||||
|
|
@ -5271,27 +5351,28 @@ struct nk_window {
|
|||
/*==============================================================
|
||||
* STACK
|
||||
* =============================================================*/
|
||||
/* The style modifier stack can be used to temporarily change a
|
||||
* property inside `nk_style`. For example if you want a special
|
||||
* red button you can temporarily push the old button color onto a stack
|
||||
* draw the button with a red color and then you just pop the old color
|
||||
* back from the stack:
|
||||
*
|
||||
* nk_style_push_style_item(ctx, &ctx->style.button.normal, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
* nk_style_push_style_item(ctx, &ctx->style.button.hover, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
* nk_style_push_style_item(ctx, &ctx->style.button.active, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
* nk_style_push_vec2(ctx, &cx->style.button.padding, nk_vec2(2,2));
|
||||
*
|
||||
* nk_button(...);
|
||||
*
|
||||
* nk_style_pop_style_item(ctx);
|
||||
* nk_style_pop_style_item(ctx);
|
||||
* nk_style_pop_style_item(ctx);
|
||||
* nk_style_pop_vec2(ctx);
|
||||
*
|
||||
* Nuklear has a stack for style_items, float properties, vector properties,
|
||||
* flags, colors, fonts and for button_behavior. Each has it's own fixed size stack
|
||||
* which can be changed at compile time.
|
||||
/*/// ### Stack
|
||||
/// The style modifier stack can be used to temporarily change a
|
||||
/// property inside `nk_style`. For example if you want a special
|
||||
/// red button you can temporarily push the old button color onto a stack
|
||||
/// draw the button with a red color and then you just pop the old color
|
||||
/// back from the stack:
|
||||
///
|
||||
/// nk_style_push_style_item(ctx, &ctx->style.button.normal, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
/// nk_style_push_style_item(ctx, &ctx->style.button.hover, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
/// nk_style_push_style_item(ctx, &ctx->style.button.active, nk_style_item_color(nk_rgb(255,0,0)));
|
||||
/// nk_style_push_vec2(ctx, &cx->style.button.padding, nk_vec2(2,2));
|
||||
///
|
||||
/// nk_button(...);
|
||||
///
|
||||
/// nk_style_pop_style_item(ctx);
|
||||
/// nk_style_pop_style_item(ctx);
|
||||
/// nk_style_pop_style_item(ctx);
|
||||
/// nk_style_pop_vec2(ctx);
|
||||
///
|
||||
/// Nuklear has a stack for style_items, float properties, vector properties,
|
||||
/// flags, colors, fonts and for button_behavior. Each has it's own fixed size stack
|
||||
/// which can be changed at compile time.
|
||||
*/
|
||||
#ifndef NK_BUTTON_BEHAVIOR_STACK_SIZE
|
||||
#define NK_BUTTON_BEHAVIOR_STACK_SIZE 8
|
||||
|
|
|
|||
|
|
@ -98,16 +98,16 @@ nk_draw_button(struct nk_command_buffer *out,
|
|||
background = &style->active;
|
||||
else background = &style->normal;
|
||||
|
||||
switch(background->type) {
|
||||
switch (background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor_background));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor_background));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, *bounds, style->rounding, background->data.color);
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color);
|
||||
nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor_background));
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor_background));
|
||||
break;
|
||||
}
|
||||
return background;
|
||||
|
|
@ -127,8 +127,8 @@ nk_do_button(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r,
|
|||
/* calculate button content space */
|
||||
content->x = r.x + style->padding.x + style->border + style->rounding;
|
||||
content->y = r.y + style->padding.y + style->border + style->rounding;
|
||||
content->w = r.w - (2 * style->padding.x + style->border + style->rounding*2);
|
||||
content->h = r.h - (2 * style->padding.y + style->border + style->rounding*2);
|
||||
content->w = r.w - (2 * (style->padding.x + style->border + style->rounding));
|
||||
content->h = r.h - (2 * (style->padding.y + style->border + style->rounding));
|
||||
|
||||
/* execute button behavior */
|
||||
bounds.x = r.x - style->touch_padding.x;
|
||||
|
|
@ -157,6 +157,8 @@ nk_draw_button_text(struct nk_command_buffer *out,
|
|||
text.text = style->text_active;
|
||||
else text.text = style->text_normal;
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor_text);
|
||||
|
||||
text.padding = nk_vec2(0,0);
|
||||
nk_widget_text(out, *content, txt, len, &text, text_alignment, font);
|
||||
}
|
||||
|
|
@ -204,6 +206,8 @@ nk_draw_button_symbol(struct nk_command_buffer *out,
|
|||
else if (state & NK_WIDGET_STATE_ACTIVED)
|
||||
sym = style->text_active;
|
||||
else sym = style->text_normal;
|
||||
|
||||
sym = nk_rgb_factor(sym, style->color_factor_text);
|
||||
nk_draw_symbol(out, type, *content, bg, sym, 1, font);
|
||||
}
|
||||
NK_LIB nk_bool
|
||||
|
|
@ -235,7 +239,7 @@ nk_draw_button_image(struct nk_command_buffer *out,
|
|||
nk_flags state, const struct nk_style_button *style, const struct nk_image *img)
|
||||
{
|
||||
nk_draw_button(out, bounds, state, style);
|
||||
nk_draw_image(out, *content, img, nk_white);
|
||||
nk_draw_image(out, *content, img, nk_rgb_factor(nk_white, style->color_factor_background));
|
||||
}
|
||||
NK_LIB nk_bool
|
||||
nk_do_button_image(nk_flags *state,
|
||||
|
|
@ -292,6 +296,8 @@ nk_draw_button_text_symbol(struct nk_command_buffer *out,
|
|||
text.text = style->text_normal;
|
||||
}
|
||||
|
||||
sym = nk_rgb_factor(sym, style->color_factor_text);
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor_text);
|
||||
text.padding = nk_vec2(0,0);
|
||||
nk_draw_symbol(out, type, *symbol, style->text_background, sym, 0, font);
|
||||
nk_widget_text(out, *label, str, len, &text, NK_TEXT_CENTERED, font);
|
||||
|
|
@ -349,9 +355,10 @@ nk_draw_button_text_image(struct nk_command_buffer *out,
|
|||
text.text = style->text_active;
|
||||
else text.text = style->text_normal;
|
||||
|
||||
text.padding = nk_vec2(0,0);
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor_text);
|
||||
text.padding = nk_vec2(0, 0);
|
||||
nk_widget_text(out, *label, str, len, &text, NK_TEXT_CENTERED, font);
|
||||
nk_draw_image(out, *image, img, nk_white);
|
||||
nk_draw_image(out, *image, img, nk_rgb_factor(nk_white, style->color_factor_background));
|
||||
}
|
||||
NK_LIB nk_bool
|
||||
nk_do_button_text_image(nk_flags *state,
|
||||
|
|
@ -456,7 +463,7 @@ nk_button_text_styled(struct nk_context *ctx,
|
|||
state = nk_widget(&bounds, ctx);
|
||||
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_button_text(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
title, len, style->text_alignment, ctx->button_behavior,
|
||||
style, in, ctx->style.font);
|
||||
|
|
@ -501,7 +508,7 @@ nk_button_color(struct nk_context *ctx, struct nk_color color)
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
|
||||
button = ctx->style.button;
|
||||
button.normal = nk_style_item_color(color);
|
||||
|
|
@ -533,7 +540,7 @@ nk_button_symbol_styled(struct nk_context *ctx,
|
|||
layout = win->layout;
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_button_symbol(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
symbol, ctx->button_behavior, style, in, ctx->style.font);
|
||||
}
|
||||
|
|
@ -566,7 +573,7 @@ nk_button_image_styled(struct nk_context *ctx, const struct nk_style_button *sty
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_button_image(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
img, ctx->button_behavior, style, in);
|
||||
}
|
||||
|
|
@ -600,7 +607,7 @@ nk_button_symbol_text_styled(struct nk_context *ctx,
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_button_text_symbol(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
symbol, text, len, align, ctx->button_behavior,
|
||||
style, ctx->style.font, in);
|
||||
|
|
@ -647,7 +654,7 @@ nk_button_image_text_styled(struct nk_context *ctx,
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_button_text_image(&ctx->last_widget_state, &win->buffer,
|
||||
bounds, img, text, len, align, ctx->button_behavior,
|
||||
style, ctx->style.font, in);
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type,
|
|||
{struct nk_chart_slot *slot = &chart->slots[chart->slot++];
|
||||
slot->type = type;
|
||||
slot->count = count;
|
||||
slot->color = color;
|
||||
slot->color = nk_rgb_factor(color, style->color_factor);
|
||||
slot->highlight = highlight;
|
||||
slot->min = NK_MIN(min_value, max_value);
|
||||
slot->max = NK_MAX(min_value, max_value);
|
||||
|
|
@ -59,15 +59,15 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type,
|
|||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(&win->buffer, bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(&win->buffer, bounds, style->rounding, style->border_color);
|
||||
nk_fill_rect(&win->buffer, bounds, style->rounding, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
nk_fill_rect(&win->buffer, nk_shrink_rect(bounds, style->border),
|
||||
style->rounding, style->background.data.color);
|
||||
style->rounding, nk_rgb_factor(style->background.data.color, style->color_factor));
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
|
|
@ -84,6 +84,8 @@ nk_chart_add_slot_colored(struct nk_context *ctx, const enum nk_chart_type type,
|
|||
struct nk_color color, struct nk_color highlight,
|
||||
int count, float min_value, float max_value)
|
||||
{
|
||||
const struct nk_style_chart* style;
|
||||
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(ctx->current);
|
||||
NK_ASSERT(ctx->current->layout);
|
||||
|
|
@ -91,12 +93,14 @@ nk_chart_add_slot_colored(struct nk_context *ctx, const enum nk_chart_type type,
|
|||
if (!ctx || !ctx->current || !ctx->current->layout) return;
|
||||
if (ctx->current->layout->chart.slot >= NK_CHART_MAX_SLOT) return;
|
||||
|
||||
style = &ctx->style.chart;
|
||||
|
||||
/* add another slot into the graph */
|
||||
{struct nk_chart *chart = &ctx->current->layout->chart;
|
||||
struct nk_chart_slot *slot = &chart->slots[chart->slot++];
|
||||
slot->type = type;
|
||||
slot->count = count;
|
||||
slot->color = color;
|
||||
slot->color = nk_rgb_factor(color, style->color_factor);
|
||||
slot->highlight = highlight;
|
||||
slot->min = NK_MIN(min_value, max_value);
|
||||
slot->max = NK_MAX(min_value, max_value);
|
||||
|
|
@ -114,7 +118,7 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
|
|||
struct nk_chart *g, float value, int slot)
|
||||
{
|
||||
struct nk_panel *layout = win->layout;
|
||||
const struct nk_input *i = &ctx->input;
|
||||
const struct nk_input *i = ctx->current->widgets_disabled ? 0 : &ctx->input;
|
||||
struct nk_command_buffer *out = &win->buffer;
|
||||
|
||||
nk_flags ret = 0;
|
||||
|
|
@ -140,7 +144,7 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
|
|||
bounds.w = bounds.h = 4;
|
||||
|
||||
color = g->slots[slot].color;
|
||||
if (!(layout->flags & NK_WINDOW_ROM) &&
|
||||
if (!(layout->flags & NK_WINDOW_ROM) && i &&
|
||||
NK_INBOX(i->mouse.pos.x,i->mouse.pos.y, g->slots[slot].last.x-3, g->slots[slot].last.y-3, 6, 6)){
|
||||
ret = nk_input_is_mouse_hovering_rect(i, bounds) ? NK_CHART_HOVERING : 0;
|
||||
ret |= (i->mouse.buttons[NK_BUTTON_LEFT].down &&
|
||||
|
|
@ -184,7 +188,7 @@ nk_chart_push_column(const struct nk_context *ctx, struct nk_window *win,
|
|||
struct nk_chart *chart, float value, int slot)
|
||||
{
|
||||
struct nk_command_buffer *out = &win->buffer;
|
||||
const struct nk_input *in = &ctx->input;
|
||||
const struct nk_input *in = ctx->current->widgets_disabled ? 0 : &ctx->input;
|
||||
struct nk_panel *layout = win->layout;
|
||||
|
||||
float ratio;
|
||||
|
|
@ -214,7 +218,7 @@ nk_chart_push_column(const struct nk_context *ctx, struct nk_window *win,
|
|||
item.x = item.x + ((float)chart->slots[slot].index);
|
||||
|
||||
/* user chart bar selection */
|
||||
if (!(layout->flags & NK_WINDOW_ROM) &&
|
||||
if (!(layout->flags & NK_WINDOW_ROM) && in &&
|
||||
NK_INBOX(in->mouse.pos.x,in->mouse.pos.y,item.x,item.y,item.w,item.h)) {
|
||||
ret = NK_CHART_HOVERING;
|
||||
ret |= (!in->mouse.buttons[NK_BUTTON_LEFT].down &&
|
||||
|
|
|
|||
|
|
@ -23,6 +23,16 @@ nk_parse_hex(const char *p, int length)
|
|||
return i;
|
||||
}
|
||||
NK_API struct nk_color
|
||||
nk_rgb_factor(struct nk_color col, const float factor)
|
||||
{
|
||||
if (factor == 1.0f)
|
||||
return col;
|
||||
col.r = (nk_byte)(col.r * factor);
|
||||
col.g = (nk_byte)(col.g * factor);
|
||||
col.b = (nk_byte)(col.b * factor);
|
||||
return col;
|
||||
}
|
||||
NK_API struct nk_color
|
||||
nk_rgba(int r, int g, int b, int a)
|
||||
{
|
||||
struct nk_color ret;
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ nk_color_pick(struct nk_context * ctx, struct nk_colorf *color,
|
|||
layout = win->layout;
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_color_picker(&ctx->last_widget_state, &win->buffer, color, fmt, bounds,
|
||||
nk_vec2(0,0), in, config->font);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ nk_combo_begin_text(struct nk_context *ctx, const char *selected, int len,
|
|||
if (s == NK_WIDGET_INVALID)
|
||||
return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -83,19 +83,21 @@ nk_combo_begin_text(struct nk_context *ctx, const char *selected, int len,
|
|||
text.text = style->combo.label_normal;
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->combo.color_factor);
|
||||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
text.background = background->data.color;
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -175,7 +177,7 @@ nk_combo_begin_color(struct nk_context *ctx, struct nk_color color, struct nk_ve
|
|||
if (s == NK_WIDGET_INVALID)
|
||||
return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -188,14 +190,14 @@ nk_combo_begin_color(struct nk_context *ctx, struct nk_color color, struct nk_ve
|
|||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -233,7 +235,7 @@ nk_combo_begin_color(struct nk_context *ctx, struct nk_color color, struct nk_ve
|
|||
bounds.w = (button.x - (style->combo.content_padding.x + style->combo.spacing.x)) - bounds.x;
|
||||
else
|
||||
bounds.w = header.w - 4 * style->combo.content_padding.x;
|
||||
nk_fill_rect(&win->buffer, bounds, 0, color);
|
||||
nk_fill_rect(&win->buffer, bounds, 0, nk_rgb_factor(color, style->combo.color_factor));
|
||||
|
||||
/* draw open/close button */
|
||||
if (draw_button_symbol)
|
||||
|
|
@ -268,7 +270,7 @@ nk_combo_begin_symbol(struct nk_context *ctx, enum nk_symbol_type symbol, struct
|
|||
if (s == NK_WIDGET_INVALID)
|
||||
return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -284,19 +286,21 @@ nk_combo_begin_symbol(struct nk_context *ctx, enum nk_symbol_type symbol, struct
|
|||
symbol_color = style->combo.symbol_hover;
|
||||
}
|
||||
|
||||
symbol_color = nk_rgb_factor(symbol_color, style->combo.color_factor);
|
||||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
sym_background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
sym_background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
sym_background = background->data.color;
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -362,7 +366,7 @@ nk_combo_begin_symbol_text(struct nk_context *ctx, const char *selected, int len
|
|||
s = nk_widget(&header, ctx);
|
||||
if (!s) return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -381,19 +385,22 @@ nk_combo_begin_symbol_text(struct nk_context *ctx, const char *selected, int len
|
|||
text.text = style->combo.label_normal;
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->combo.color_factor);
|
||||
symbol_color = nk_rgb_factor(symbol_color, style->combo.color_factor);
|
||||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
text.background = background->data.color;
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -464,7 +471,7 @@ nk_combo_begin_image(struct nk_context *ctx, struct nk_image img, struct nk_vec2
|
|||
if (s == NK_WIDGET_INVALID)
|
||||
return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -477,14 +484,14 @@ nk_combo_begin_image(struct nk_context *ctx, struct nk_image img, struct nk_vec2
|
|||
|
||||
switch (background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -522,7 +529,7 @@ nk_combo_begin_image(struct nk_context *ctx, struct nk_image img, struct nk_vec2
|
|||
bounds.w = (button.x - style->combo.content_padding.y) - bounds.x;
|
||||
else
|
||||
bounds.w = header.w - 2 * style->combo.content_padding.x;
|
||||
nk_draw_image(&win->buffer, bounds, &img, nk_white);
|
||||
nk_draw_image(&win->buffer, bounds, &img, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
|
||||
/* draw open/close button */
|
||||
if (draw_button_symbol)
|
||||
|
|
@ -556,7 +563,7 @@ nk_combo_begin_image_text(struct nk_context *ctx, const char *selected, int len,
|
|||
s = nk_widget(&header, ctx);
|
||||
if (!s) return 0;
|
||||
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED || s == NK_WIDGET_ROM)? 0: &ctx->input;
|
||||
if (nk_button_behavior(&ctx->last_widget_state, header, in, NK_BUTTON_DEFAULT))
|
||||
is_clicked = nk_true;
|
||||
|
||||
|
|
@ -572,19 +579,21 @@ nk_combo_begin_image_text(struct nk_context *ctx, const char *selected, int len,
|
|||
text.text = style->combo.label_normal;
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->combo.color_factor);
|
||||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_white);
|
||||
nk_draw_image(&win->buffer, header, &background->data.image, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
text.background = background->data.color;
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color);
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color);
|
||||
nk_fill_rect(&win->buffer, header, style->combo.rounding, nk_rgb_factor(background->data.color, style->combo.color_factor));
|
||||
nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, nk_rgb_factor(style->combo.border_color, style->combo.color_factor));
|
||||
break;
|
||||
}
|
||||
{
|
||||
|
|
@ -623,7 +632,7 @@ nk_combo_begin_image_text(struct nk_context *ctx, const char *selected, int len,
|
|||
image.y = header.y + style->combo.content_padding.y;
|
||||
image.h = header.h - 2 * style->combo.content_padding.y;
|
||||
image.w = image.h;
|
||||
nk_draw_image(&win->buffer, image, &img, nk_white);
|
||||
nk_draw_image(&win->buffer, image, &img, nk_rgb_factor(nk_white, style->combo.color_factor));
|
||||
|
||||
/* draw label */
|
||||
text.padding = nk_vec2(0,0);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
|
|||
struct nk_window *win;
|
||||
struct nk_window *popup;
|
||||
struct nk_rect body;
|
||||
struct nk_input* in;
|
||||
|
||||
NK_STORAGE const struct nk_rect null_rect = {-1,-1,0,0};
|
||||
int is_clicked = 0;
|
||||
|
|
@ -33,35 +34,39 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
|
|||
/* check if currently active contextual is active */
|
||||
popup = win->popup.win;
|
||||
is_open = (popup && win->popup.type == NK_PANEL_CONTEXTUAL);
|
||||
is_clicked = nk_input_mouse_clicked(&ctx->input, NK_BUTTON_RIGHT, trigger_bounds);
|
||||
if (win->popup.active_con && win->popup.con_count != win->popup.active_con)
|
||||
return 0;
|
||||
if (!is_open && win->popup.active_con)
|
||||
win->popup.active_con = 0;
|
||||
if ((!is_open && !is_clicked))
|
||||
return 0;
|
||||
in = win->widgets_disabled ? 0 : &ctx->input;
|
||||
if (in) {
|
||||
is_clicked = nk_input_mouse_clicked(in, NK_BUTTON_RIGHT, trigger_bounds);
|
||||
if (win->popup.active_con && win->popup.con_count != win->popup.active_con)
|
||||
return 0;
|
||||
if (!is_open && win->popup.active_con)
|
||||
win->popup.active_con = 0;
|
||||
if ((!is_open && !is_clicked))
|
||||
return 0;
|
||||
|
||||
/* calculate contextual position on click */
|
||||
win->popup.active_con = win->popup.con_count;
|
||||
if (is_clicked) {
|
||||
body.x = ctx->input.mouse.pos.x;
|
||||
body.y = ctx->input.mouse.pos.y;
|
||||
} else {
|
||||
body.x = popup->bounds.x;
|
||||
body.y = popup->bounds.y;
|
||||
}
|
||||
body.w = size.x;
|
||||
body.h = size.y;
|
||||
/* calculate contextual position on click */
|
||||
win->popup.active_con = win->popup.con_count;
|
||||
if (is_clicked) {
|
||||
body.x = in->mouse.pos.x;
|
||||
body.y = in->mouse.pos.y;
|
||||
} else {
|
||||
body.x = popup->bounds.x;
|
||||
body.y = popup->bounds.y;
|
||||
}
|
||||
|
||||
/* start nonblocking contextual popup */
|
||||
ret = nk_nonblock_begin(ctx, flags|NK_WINDOW_NO_SCROLLBAR, body,
|
||||
body.w = size.x;
|
||||
body.h = size.y;
|
||||
|
||||
/* start nonblocking contextual popup */
|
||||
ret = nk_nonblock_begin(ctx, flags | NK_WINDOW_NO_SCROLLBAR, body,
|
||||
null_rect, NK_PANEL_CONTEXTUAL);
|
||||
if (ret) win->popup.type = NK_PANEL_CONTEXTUAL;
|
||||
else {
|
||||
win->popup.active_con = 0;
|
||||
win->popup.type = NK_PANEL_NONE;
|
||||
if (win->popup.win)
|
||||
win->popup.win->flags = 0;
|
||||
if (ret) win->popup.type = NK_PANEL_CONTEXTUAL;
|
||||
else {
|
||||
win->popup.active_con = 0;
|
||||
win->popup.type = NK_PANEL_NONE;
|
||||
if (win->popup.win)
|
||||
win->popup.win->flags = 0;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,6 +94,9 @@ nk_edit_draw_text(struct nk_command_buffer *out,
|
|||
txt.background = background;
|
||||
txt.text = foreground;
|
||||
|
||||
foreground = nk_rgb_factor(foreground, style->color_factor);
|
||||
background = nk_rgb_factor(background, style->color_factor);
|
||||
|
||||
glyph_len = nk_utf_decode(text+text_len, &unicode, byte_len-text_len);
|
||||
if (!glyph_len) return;
|
||||
while ((text_len < byte_len) && glyph_len)
|
||||
|
|
@ -331,14 +334,14 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
|
|||
/* draw background frame */
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, bounds, style->rounding, background->data.color);
|
||||
nk_stroke_rect(out, bounds, style->rounding, style->border, style->border_color);
|
||||
nk_fill_rect(out, bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
nk_stroke_rect(out, bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
break;
|
||||
}}
|
||||
|
||||
|
|
@ -547,6 +550,8 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
|
|||
else
|
||||
background_color = background->data.color;
|
||||
|
||||
cursor_color = nk_rgb_factor(cursor_color, style->color_factor);
|
||||
cursor_text_color = nk_rgb_factor(cursor_text_color, style->color_factor);
|
||||
|
||||
if (edit->select_start == edit->select_end) {
|
||||
/* no selection so just draw the complete text */
|
||||
|
|
@ -654,6 +659,10 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
|
|||
background_color = nk_rgba(0,0,0,0);
|
||||
else
|
||||
background_color = background->data.color;
|
||||
|
||||
background_color = nk_rgb_factor(background_color, style->color_factor);
|
||||
text_color = nk_rgb_factor(text_color, style->color_factor);
|
||||
|
||||
nk_edit_draw_text(out, style, area.x - edit->scrollbar.x,
|
||||
area.y - edit->scrollbar.y, 0, begin, l, row_height, font,
|
||||
background_color, text_color, nk_false);
|
||||
|
|
@ -773,6 +782,8 @@ nk_edit_buffer(struct nk_context *ctx, nk_flags flags,
|
|||
style = &ctx->style;
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return state;
|
||||
else if (state == NK_WIDGET_DISABLED)
|
||||
flags |= NK_EDIT_READ_ONLY;
|
||||
in = (win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
|
||||
/* check if edit is currently hot item */
|
||||
|
|
|
|||
|
|
@ -354,7 +354,6 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
|
|||
|
||||
/* query glyph bounds from stb_truetype */
|
||||
const stbtt_packedchar *pc = &range->chardata_for_range[char_idx];
|
||||
if (!pc->x0 && !pc->x1 && !pc->y0 && !pc->y1) continue;
|
||||
codepoint = (nk_rune)(range->first_unicode_codepoint_in_range + char_idx);
|
||||
stbtt_GetPackedQuad(range->chardata_for_range, (int)width,
|
||||
(int)height, char_idx, &dummy_x, &dummy_y, &q, 0);
|
||||
|
|
|
|||
|
|
@ -83,6 +83,10 @@ nk_input_button(struct nk_context *ctx, enum nk_buttons id, int x, int y, nk_boo
|
|||
btn->clicked_pos.y = (float)y;
|
||||
btn->down = down;
|
||||
btn->clicked++;
|
||||
|
||||
/* Fix Click-Drag for touch events. */
|
||||
in->mouse.delta.x = 0;
|
||||
in->mouse.delta.y = 0;
|
||||
#ifdef NK_BUTTON_TRIGGER_ON_RELEASE
|
||||
if (down == 1 && id == NK_BUTTON_LEFT)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -255,9 +255,9 @@ enum nk_toggle_type {
|
|||
NK_TOGGLE_OPTION
|
||||
};
|
||||
NK_LIB nk_bool nk_toggle_behavior(const struct nk_input *in, struct nk_rect select, nk_flags *state, nk_bool active);
|
||||
NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font);
|
||||
NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font);
|
||||
NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font);
|
||||
NK_LIB void nk_draw_checkbox(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags text_alignment);
|
||||
NK_LIB void nk_draw_option(struct nk_command_buffer *out, nk_flags state, const struct nk_style_toggle *style, nk_bool active, const struct nk_rect *label, const struct nk_rect *selector, const struct nk_rect *cursors, const char *string, int len, const struct nk_user_font *font, nk_flags text_alignment);
|
||||
NK_LIB nk_bool nk_do_toggle(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r, nk_bool *active, const char *str, int len, enum nk_toggle_type type, const struct nk_style_toggle *style, const struct nk_input *in, const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment);
|
||||
|
||||
/* progress */
|
||||
NK_LIB nk_size nk_progress_behavior(nk_flags *state, struct nk_input *in, struct nk_rect r, struct nk_rect cursor, nk_size max, nk_size value, nk_bool modifiable);
|
||||
|
|
@ -328,21 +328,36 @@ NK_LIB void nk_property(struct nk_context *ctx, const char *name, struct nk_prop
|
|||
|
||||
#ifdef NK_INCLUDE_FONT_BAKING
|
||||
|
||||
/**
|
||||
* @def NK_NO_STB_RECT_PACK_IMPLEMENTATION
|
||||
*
|
||||
* When defined, will avoid enabling STB_RECT_PACK_IMPLEMENTATION for when stb_rect_pack.h is already implemented elsewhere.
|
||||
*/
|
||||
#ifndef NK_NO_STB_RECT_PACK_IMPLEMENTATION
|
||||
#define STB_RECT_PACK_IMPLEMENTATION
|
||||
#endif /* NK_NO_STB_RECT_PACK_IMPLEMENTATION */
|
||||
|
||||
/**
|
||||
* @def NK_NO_STB_TRUETYPE_IMPLEMENTATION
|
||||
*
|
||||
* When defined, will avoid enabling STB_TRUETYPE_IMPLEMENTATION for when stb_truetype.h is already implemented elsewhere.
|
||||
*/
|
||||
#ifndef NK_NO_STB_TRUETYPE_IMPLEMENTATION
|
||||
#define STB_TRUETYPE_IMPLEMENTATION
|
||||
#endif /* NK_NO_STB_TRUETYPE_IMPLEMENTATION */
|
||||
|
||||
/* Allow consumer to define own STBTT_malloc/STBTT_free, and use the font atlas' allocator otherwise */
|
||||
#ifndef STBTT_malloc
|
||||
static void*
|
||||
nk_stbtt_malloc(nk_size size, void *user_data) {
|
||||
struct nk_allocator *alloc = (struct nk_allocator *) user_data;
|
||||
return alloc->alloc(alloc->userdata, 0, size);
|
||||
struct nk_allocator *alloc = (struct nk_allocator *) user_data;
|
||||
return alloc->alloc(alloc->userdata, 0, size);
|
||||
}
|
||||
|
||||
static void
|
||||
nk_stbtt_free(void *ptr, void *user_data) {
|
||||
struct nk_allocator *alloc = (struct nk_allocator *) user_data;
|
||||
alloc->free(alloc->userdata, ptr);
|
||||
struct nk_allocator *alloc = (struct nk_allocator *) user_data;
|
||||
alloc->free(alloc->userdata, ptr);
|
||||
}
|
||||
|
||||
#define STBTT_malloc(x,u) nk_stbtt_malloc(x,u)
|
||||
|
|
|
|||
|
|
@ -6,32 +6,33 @@
|
|||
* MATH
|
||||
*
|
||||
* ===============================================================*/
|
||||
/* Since nuklear is supposed to work on all systems providing floating point
|
||||
math without any dependencies I also had to implement my own math functions
|
||||
for sqrt, sin and cos. Since the actual highly accurate implementations for
|
||||
the standard library functions are quite complex and I do not need high
|
||||
precision for my use cases I use approximations.
|
||||
|
||||
Sqrt
|
||||
----
|
||||
For square root nuklear uses the famous fast inverse square root:
|
||||
https://en.wikipedia.org/wiki/Fast_inverse_square_root with
|
||||
slightly tweaked magic constant. While on today's hardware it is
|
||||
probably not faster it is still fast and accurate enough for
|
||||
nuklear's use cases. IMPORTANT: this requires float format IEEE 754
|
||||
|
||||
Sine/Cosine
|
||||
-----------
|
||||
All constants inside both function are generated Remez's minimax
|
||||
approximations for value range 0...2*PI. The reason why I decided to
|
||||
approximate exactly that range is that nuklear only needs sine and
|
||||
cosine to generate circles which only requires that exact range.
|
||||
In addition I used Remez instead of Taylor for additional precision:
|
||||
www.lolengine.net/blog/2011/12/21/better-function-approximations.
|
||||
|
||||
The tool I used to generate constants for both sine and cosine
|
||||
(it can actually approximate a lot more functions) can be
|
||||
found here: www.lolengine.net/wiki/oss/lolremez
|
||||
/*/// ### Math
|
||||
/// Since nuklear is supposed to work on all systems providing floating point
|
||||
/// math without any dependencies I also had to implement my own math functions
|
||||
/// for sqrt, sin and cos. Since the actual highly accurate implementations for
|
||||
/// the standard library functions are quite complex and I do not need high
|
||||
/// precision for my use cases I use approximations.
|
||||
///
|
||||
/// Sqrt
|
||||
/// ----
|
||||
/// For square root nuklear uses the famous fast inverse square root:
|
||||
/// https://en.wikipedia.org/wiki/Fast_inverse_square_root with
|
||||
/// slightly tweaked magic constant. While on today's hardware it is
|
||||
/// probably not faster it is still fast and accurate enough for
|
||||
/// nuklear's use cases. IMPORTANT: this requires float format IEEE 754
|
||||
///
|
||||
/// Sine/Cosine
|
||||
/// -----------
|
||||
/// All constants inside both function are generated Remez's minimax
|
||||
/// approximations for value range 0...2*PI. The reason why I decided to
|
||||
/// approximate exactly that range is that nuklear only needs sine and
|
||||
/// cosine to generate circles which only requires that exact range.
|
||||
/// In addition I used Remez instead of Taylor for additional precision:
|
||||
/// www.lolengine.net/blog/2011/12/21/better-function-approximations.
|
||||
///
|
||||
/// The tool I used to generate constants for both sine and cosine
|
||||
/// (it can actually approximate a lot more functions) can be
|
||||
/// found here: www.lolengine.net/wiki/oss/lolremez
|
||||
*/
|
||||
#ifndef NK_INV_SQRT
|
||||
#define NK_INV_SQRT nk_inv_sqrt
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ nk_menu_begin_text(struct nk_context *ctx, const char *title, int len,
|
|||
win = ctx->current;
|
||||
state = nk_widget(&header, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || win->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || win->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
if (nk_do_button_text(&ctx->last_widget_state, &win->buffer, header,
|
||||
title, len, align, NK_BUTTON_DEFAULT, &ctx->style.menu_button, in, ctx->style.font))
|
||||
is_clicked = nk_true;
|
||||
|
|
@ -158,7 +158,7 @@ nk_menu_begin_image(struct nk_context *ctx, const char *id, struct nk_image img,
|
|||
win = ctx->current;
|
||||
state = nk_widget(&header, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
if (nk_do_button_image(&ctx->last_widget_state, &win->buffer, header,
|
||||
img, NK_BUTTON_DEFAULT, &ctx->style.menu_button, in))
|
||||
is_clicked = nk_true;
|
||||
|
|
@ -183,7 +183,7 @@ nk_menu_begin_symbol(struct nk_context *ctx, const char *id,
|
|||
win = ctx->current;
|
||||
state = nk_widget(&header, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
if (nk_do_button_symbol(&ctx->last_widget_state, &win->buffer, header,
|
||||
sym, NK_BUTTON_DEFAULT, &ctx->style.menu_button, in, ctx->style.font))
|
||||
is_clicked = nk_true;
|
||||
|
|
@ -208,7 +208,7 @@ nk_menu_begin_image_text(struct nk_context *ctx, const char *title, int len,
|
|||
win = ctx->current;
|
||||
state = nk_widget(&header, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
if (nk_do_button_text_image(&ctx->last_widget_state, &win->buffer,
|
||||
header, img, title, len, align, NK_BUTTON_DEFAULT, &ctx->style.menu_button,
|
||||
ctx->style.font, in))
|
||||
|
|
@ -241,7 +241,7 @@ nk_menu_begin_symbol_text(struct nk_context *ctx, const char *title, int len,
|
|||
state = nk_widget(&header, ctx);
|
||||
if (!state) return 0;
|
||||
|
||||
in = (state == NK_WIDGET_ROM || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || win->layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
if (nk_do_button_text_symbol(&ctx->last_widget_state, &win->buffer,
|
||||
header, sym, title, len, align, NK_BUTTON_DEFAULT, &ctx->style.menu_button,
|
||||
ctx->style.font, in)) is_clicked = nk_true;
|
||||
|
|
|
|||
|
|
@ -62,28 +62,28 @@ nk_draw_progress(struct nk_command_buffer *out, nk_flags state,
|
|||
/* draw background */
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, *bounds, style->rounding, background->data.color);
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color);
|
||||
nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
break;
|
||||
}
|
||||
|
||||
/* draw cursor */
|
||||
switch(cursor->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, *scursor, &cursor->data.image, nk_white);
|
||||
nk_draw_image(out, *scursor, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, *scursor, &cursor->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *scursor, &cursor->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, *scursor, style->rounding, cursor->data.color);
|
||||
nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color);
|
||||
nk_fill_rect(out, *scursor, style->rounding, nk_rgb_factor(cursor->data.color, style->color_factor));
|
||||
nk_stroke_rect(out, *scursor, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -143,7 +143,7 @@ nk_progress(struct nk_context *ctx, nk_size *cur, nk_size max, nk_bool is_modify
|
|||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
old_value = *cur;
|
||||
*cur = nk_do_progress(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
*cur, max, is_modifyable, &style->progress, in);
|
||||
|
|
|
|||
|
|
@ -85,20 +85,22 @@ nk_draw_property(struct nk_command_buffer *out, const struct nk_style_property *
|
|||
text.text = style->label_normal;
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor);
|
||||
|
||||
/* draw background */
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
text.background = background->data.color;
|
||||
nk_fill_rect(out, *bounds, style->rounding, background->data.color);
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, background->data.color);
|
||||
nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -383,7 +385,7 @@ nk_property(struct nk_context *ctx, const char *name, struct nk_property_variant
|
|||
old_state = *state;
|
||||
ctx->text_edit.clip = ctx->clip;
|
||||
in = ((s == NK_WIDGET_ROM && !win->property.active) ||
|
||||
layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
layout->flags & NK_WINDOW_ROM || s == NK_WIDGET_DISABLED) ? 0 : &ctx->input;
|
||||
nk_do_property(&ctx->last_widget_state, &win->buffer, bounds, name,
|
||||
variant, inc_per_pixel, buffer, len, state, cursor, select_begin,
|
||||
select_end, &style->property, filter, in, style->font, &ctx->text_edit,
|
||||
|
|
|
|||
|
|
@ -41,15 +41,18 @@ nk_draw_selectable(struct nk_command_buffer *out,
|
|||
text.text = style->text_normal_active;
|
||||
}
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor);
|
||||
|
||||
/* draw selectable background and text */
|
||||
switch (background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
text.background = nk_rgba(0, 0, 0, 0);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
text.background = background->data.color;
|
||||
|
|
@ -57,7 +60,7 @@ nk_draw_selectable(struct nk_command_buffer *out,
|
|||
break;
|
||||
}
|
||||
if (icon) {
|
||||
if (img) nk_draw_image(out, *icon, img, nk_white);
|
||||
if (img) nk_draw_image(out, *icon, img, nk_rgb_factor(nk_white, style->color_factor));
|
||||
else nk_draw_symbol(out, sym, *icon, text.background, text.text, 1, font);
|
||||
}
|
||||
nk_widget_text(out, *bounds, string, len, &text, align, font);
|
||||
|
|
@ -218,7 +221,7 @@ nk_selectable_text(struct nk_context *ctx, const char *str, int len,
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_selectable(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
str, len, align, value, &style->selectable, in, style->font);
|
||||
}
|
||||
|
|
@ -247,7 +250,7 @@ nk_selectable_image_text(struct nk_context *ctx, struct nk_image img,
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_selectable_image(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
str, len, align, value, &img, &style->selectable, in, style->font);
|
||||
}
|
||||
|
|
@ -276,7 +279,7 @@ nk_selectable_symbol_text(struct nk_context *ctx, enum nk_symbol_type sym,
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return 0;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
return nk_do_selectable_symbol(&ctx->last_widget_state, &win->buffer, bounds,
|
||||
str, len, align, value, sym, &style->selectable, in, style->font);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state,
|
|||
bar_color = style->bar_normal;
|
||||
cursor = &style->cursor_normal;
|
||||
}
|
||||
|
||||
/* calculate slider background bar */
|
||||
bar.x = bounds->x;
|
||||
bar.y = (visual_cursor->y + visual_cursor->h/2) - bounds->h/12;
|
||||
|
|
@ -93,26 +94,26 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state,
|
|||
/* draw background */
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_white);
|
||||
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, *bounds, style->rounding, background->data.color);
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color);
|
||||
nk_fill_rect(out, *bounds, style->rounding, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
nk_stroke_rect(out, *bounds, style->rounding, style->border, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
break;
|
||||
}
|
||||
|
||||
/* draw slider bar */
|
||||
nk_fill_rect(out, bar, style->rounding, bar_color);
|
||||
nk_fill_rect(out, fill, style->rounding, style->bar_filled);
|
||||
nk_fill_rect(out, bar, style->rounding, nk_rgb_factor(bar_color, style->color_factor));
|
||||
nk_fill_rect(out, fill, style->rounding, nk_rgb_factor(style->bar_filled, style->color_factor));
|
||||
|
||||
/* draw cursor */
|
||||
if (cursor->type == NK_STYLE_ITEM_IMAGE)
|
||||
nk_draw_image(out, *visual_cursor, &cursor->data.image, nk_white);
|
||||
nk_draw_image(out, *visual_cursor, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
else
|
||||
nk_fill_circle(out, *visual_cursor, cursor->data.color);
|
||||
nk_fill_circle(out, *visual_cursor, nk_rgb_factor(cursor->data.color, style->color_factor));
|
||||
}
|
||||
NK_LIB float
|
||||
nk_do_slider(nk_flags *state,
|
||||
|
|
@ -230,7 +231,7 @@ nk_slider_float(struct nk_context *ctx, float min_value, float *value, float max
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return ret;
|
||||
in = (/*state == NK_WIDGET_ROM || */ layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (/*state == NK_WIDGET_ROM || */ state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
|
||||
old_value = *value;
|
||||
*value = nk_do_slider(&ctx->last_widget_state, &win->buffer, bounds, min_value,
|
||||
|
|
|
|||
|
|
@ -113,27 +113,32 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
text = &style->text;
|
||||
text->color = table[NK_COLOR_TEXT];
|
||||
text->padding = nk_vec2(0,0);
|
||||
text->color_factor = 1.0f;
|
||||
text->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* default button */
|
||||
button = &style->button;
|
||||
nk_zero_struct(*button);
|
||||
button->normal = nk_style_item_color(table[NK_COLOR_BUTTON]);
|
||||
button->hover = nk_style_item_color(table[NK_COLOR_BUTTON_HOVER]);
|
||||
button->active = nk_style_item_color(table[NK_COLOR_BUTTON_ACTIVE]);
|
||||
button->border_color = table[NK_COLOR_BORDER];
|
||||
button->text_background = table[NK_COLOR_BUTTON];
|
||||
button->text_normal = table[NK_COLOR_TEXT];
|
||||
button->text_hover = table[NK_COLOR_TEXT];
|
||||
button->text_active = table[NK_COLOR_TEXT];
|
||||
button->padding = nk_vec2(2.0f,2.0f);
|
||||
button->image_padding = nk_vec2(0.0f,0.0f);
|
||||
button->touch_padding = nk_vec2(0.0f, 0.0f);
|
||||
button->userdata = nk_handle_ptr(0);
|
||||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 1.0f;
|
||||
button->rounding = 4.0f;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
button->normal = nk_style_item_color(table[NK_COLOR_BUTTON]);
|
||||
button->hover = nk_style_item_color(table[NK_COLOR_BUTTON_HOVER]);
|
||||
button->active = nk_style_item_color(table[NK_COLOR_BUTTON_ACTIVE]);
|
||||
button->border_color = table[NK_COLOR_BORDER];
|
||||
button->text_background = table[NK_COLOR_BUTTON];
|
||||
button->text_normal = table[NK_COLOR_TEXT];
|
||||
button->text_hover = table[NK_COLOR_TEXT];
|
||||
button->text_active = table[NK_COLOR_TEXT];
|
||||
button->padding = nk_vec2(2.0f,2.0f);
|
||||
button->image_padding = nk_vec2(0.0f,0.0f);
|
||||
button->touch_padding = nk_vec2(0.0f, 0.0f);
|
||||
button->userdata = nk_handle_ptr(0);
|
||||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 1.0f;
|
||||
button->rounding = 4.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
/* contextual button */
|
||||
button = &style->contextual_button;
|
||||
|
|
@ -152,6 +157,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
|
|
@ -172,6 +180,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 1.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
|
|
@ -193,6 +204,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
toggle->border_color = nk_rgba(0,0,0,0);
|
||||
toggle->border = 0.0f;
|
||||
toggle->spacing = 4;
|
||||
toggle->color_factor = 1.0f;
|
||||
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* option toggle */
|
||||
toggle = &style->option;
|
||||
|
|
@ -212,6 +225,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
toggle->border_color = nk_rgba(0,0,0,0);
|
||||
toggle->border = 0.0f;
|
||||
toggle->spacing = 4;
|
||||
toggle->color_factor = 1.0f;
|
||||
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* selectable */
|
||||
select = &style->selectable;
|
||||
|
|
@ -233,6 +248,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
select->touch_padding = nk_vec2(0,0);
|
||||
select->userdata = nk_handle_ptr(0);
|
||||
select->rounding = 0.0f;
|
||||
select->color_factor = 1.0f;
|
||||
select->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
select->draw_begin = 0;
|
||||
select->draw_end = 0;
|
||||
|
||||
|
|
@ -258,6 +275,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
slider->show_buttons = nk_false;
|
||||
slider->bar_height = 8;
|
||||
slider->rounding = 0;
|
||||
slider->color_factor = 1.0f;
|
||||
slider->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
slider->draw_begin = 0;
|
||||
slider->draw_end = 0;
|
||||
|
||||
|
|
@ -277,6 +296,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 1.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
style->slider.dec_button = style->slider.inc_button;
|
||||
|
|
@ -298,6 +320,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
prog->border = 0;
|
||||
prog->cursor_rounding = 0;
|
||||
prog->cursor_border = 0;
|
||||
prog->color_factor = 1.0f;
|
||||
prog->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
prog->draw_begin = 0;
|
||||
prog->draw_end = 0;
|
||||
|
||||
|
|
@ -321,6 +345,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
scroll->rounding = 0;
|
||||
scroll->border_cursor = 0;
|
||||
scroll->rounding_cursor = 0;
|
||||
scroll->color_factor = 1.0f;
|
||||
scroll->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
scroll->draw_begin = 0;
|
||||
scroll->draw_end = 0;
|
||||
style->scrollv = style->scrollh;
|
||||
|
|
@ -341,6 +367,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 1.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
style->scrollh.dec_button = style->scrollh.inc_button;
|
||||
|
|
@ -372,6 +401,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
edit->cursor_size = 4;
|
||||
edit->border = 1;
|
||||
edit->rounding = 0;
|
||||
edit->color_factor = 1.0f;
|
||||
edit->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* property */
|
||||
property = &style->property;
|
||||
|
|
@ -391,6 +422,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
property->rounding = 10;
|
||||
property->draw_begin = 0;
|
||||
property->draw_end = 0;
|
||||
property->color_factor = 1.0f;
|
||||
property->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* property buttons */
|
||||
button = &style->property.dec_button;
|
||||
|
|
@ -409,6 +442,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
style->property.inc_button = style->property.dec_button;
|
||||
|
|
@ -435,6 +471,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
edit->cursor_size = 8;
|
||||
edit->border = 0;
|
||||
edit->rounding = 0;
|
||||
edit->color_factor = 1.0f;
|
||||
edit->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* chart */
|
||||
chart = &style->chart;
|
||||
|
|
@ -446,6 +484,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
chart->padding = nk_vec2(4,4);
|
||||
chart->border = 0;
|
||||
chart->rounding = 0;
|
||||
chart->color_factor = 1.0f;
|
||||
chart->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* combo */
|
||||
combo = &style->combo;
|
||||
|
|
@ -464,6 +504,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
combo->spacing = nk_vec2(4,0);
|
||||
combo->border = 1;
|
||||
combo->rounding = 0;
|
||||
combo->color_factor = 1.0f;
|
||||
combo->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* combo button */
|
||||
button = &style->combo.button;
|
||||
|
|
@ -482,6 +524,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
|
|
@ -497,6 +542,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
tab->indent = 10.0f;
|
||||
tab->border = 1;
|
||||
tab->rounding = 0;
|
||||
tab->color_factor = 1.0f;
|
||||
tab->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
|
||||
/* tab button */
|
||||
button = &style->tab.tab_minimize_button;
|
||||
|
|
@ -515,6 +562,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
style->tab.tab_maximize_button =*button;
|
||||
|
|
@ -536,6 +586,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
style->tab.node_maximize_button =*button;
|
||||
|
|
@ -573,6 +626,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
|
|
@ -593,6 +649,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 0.0f;
|
||||
button->rounding = 0.0f;
|
||||
button->color_factor_text = 1.0f;
|
||||
button->color_factor_background = 1.0f;
|
||||
button->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
|
||||
button->draw_begin = 0;
|
||||
button->draw_end = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ nk_text_colored(struct nk_context *ctx, const char *str, int len,
|
|||
text.padding.x = item_padding.x;
|
||||
text.padding.y = item_padding.y;
|
||||
text.background = style->window.background;
|
||||
text.text = color;
|
||||
text.text = nk_rgb_factor(color, style->text.color_factor);
|
||||
nk_widget_text(&win->buffer, bounds, str, len, &text, alignment, style->font);
|
||||
}
|
||||
NK_API void
|
||||
|
|
@ -141,7 +141,7 @@ nk_text_wrap_colored(struct nk_context *ctx, const char *str,
|
|||
text.padding.x = item_padding.x;
|
||||
text.padding.y = item_padding.y;
|
||||
text.background = style->window.background;
|
||||
text.text = color;
|
||||
text.text = nk_rgb_factor(color, style->text.color_factor);
|
||||
nk_widget_text_wrap(&win->buffer, bounds, str, len, &text, style->font);
|
||||
}
|
||||
#ifdef NK_INCLUDE_STANDARD_VARARGS
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ nk_draw_checkbox(struct nk_command_buffer *out,
|
|||
nk_flags state, const struct nk_style_toggle *style, nk_bool active,
|
||||
const struct nk_rect *label, const struct nk_rect *selector,
|
||||
const struct nk_rect *cursors, const char *string, int len,
|
||||
const struct nk_user_font *font)
|
||||
const struct nk_user_font *font, nk_flags text_alignment)
|
||||
{
|
||||
const struct nk_style_item *background;
|
||||
const struct nk_style_item *cursor;
|
||||
|
|
@ -47,28 +47,29 @@ nk_draw_checkbox(struct nk_command_buffer *out,
|
|||
text.text = style->text_normal;
|
||||
}
|
||||
|
||||
/* draw background and cursor */
|
||||
if (background->type == NK_STYLE_ITEM_COLOR) {
|
||||
nk_fill_rect(out, *selector, 0, style->border_color);
|
||||
nk_fill_rect(out, nk_shrink_rect(*selector, style->border), 0, background->data.color);
|
||||
} else nk_draw_image(out, *selector, &background->data.image, nk_white);
|
||||
if (active) {
|
||||
if (cursor->type == NK_STYLE_ITEM_IMAGE)
|
||||
nk_draw_image(out, *cursors, &cursor->data.image, nk_white);
|
||||
else nk_fill_rect(out, *cursors, 0, cursor->data.color);
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor);
|
||||
text.padding.x = 0;
|
||||
text.padding.y = 0;
|
||||
text.background = style->text_background;
|
||||
nk_widget_text(out, *label, string, len, &text, NK_TEXT_LEFT, font);
|
||||
nk_widget_text(out, *label, string, len, &text, text_alignment, font);
|
||||
|
||||
/* draw background and cursor */
|
||||
if (background->type == NK_STYLE_ITEM_COLOR) {
|
||||
nk_fill_rect(out, *selector, 0, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
nk_fill_rect(out, nk_shrink_rect(*selector, style->border), 0, nk_rgb_factor(background->data.color, style->color_factor));
|
||||
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
if (active) {
|
||||
if (cursor->type == NK_STYLE_ITEM_IMAGE)
|
||||
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
else nk_fill_rect(out, *cursors, 0, cursor->data.color);
|
||||
}
|
||||
}
|
||||
NK_LIB void
|
||||
nk_draw_option(struct nk_command_buffer *out,
|
||||
nk_flags state, const struct nk_style_toggle *style, nk_bool active,
|
||||
const struct nk_rect *label, const struct nk_rect *selector,
|
||||
const struct nk_rect *cursors, const char *string, int len,
|
||||
const struct nk_user_font *font)
|
||||
const struct nk_user_font *font, nk_flags text_alignment)
|
||||
{
|
||||
const struct nk_style_item *background;
|
||||
const struct nk_style_item *cursor;
|
||||
|
|
@ -89,28 +90,29 @@ nk_draw_option(struct nk_command_buffer *out,
|
|||
text.text = style->text_normal;
|
||||
}
|
||||
|
||||
/* draw background and cursor */
|
||||
if (background->type == NK_STYLE_ITEM_COLOR) {
|
||||
nk_fill_circle(out, *selector, style->border_color);
|
||||
nk_fill_circle(out, nk_shrink_rect(*selector, style->border), background->data.color);
|
||||
} else nk_draw_image(out, *selector, &background->data.image, nk_white);
|
||||
if (active) {
|
||||
if (cursor->type == NK_STYLE_ITEM_IMAGE)
|
||||
nk_draw_image(out, *cursors, &cursor->data.image, nk_white);
|
||||
else nk_fill_circle(out, *cursors, cursor->data.color);
|
||||
}
|
||||
|
||||
text.text = nk_rgb_factor(text.text, style->color_factor);
|
||||
text.padding.x = 0;
|
||||
text.padding.y = 0;
|
||||
text.background = style->text_background;
|
||||
nk_widget_text(out, *label, string, len, &text, NK_TEXT_LEFT, font);
|
||||
nk_widget_text(out, *label, string, len, &text, text_alignment, font);
|
||||
|
||||
/* draw background and cursor */
|
||||
if (background->type == NK_STYLE_ITEM_COLOR) {
|
||||
nk_fill_circle(out, *selector, nk_rgb_factor(style->border_color, style->color_factor));
|
||||
nk_fill_circle(out, nk_shrink_rect(*selector, style->border), nk_rgb_factor(background->data.color, style->color_factor));
|
||||
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
if (active) {
|
||||
if (cursor->type == NK_STYLE_ITEM_IMAGE)
|
||||
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
|
||||
else nk_fill_circle(out, *cursors, cursor->data.color);
|
||||
}
|
||||
}
|
||||
NK_LIB nk_bool
|
||||
nk_do_toggle(nk_flags *state,
|
||||
struct nk_command_buffer *out, struct nk_rect r,
|
||||
nk_bool *active, const char *str, int len, enum nk_toggle_type type,
|
||||
const struct nk_style_toggle *style, const struct nk_input *in,
|
||||
const struct nk_user_font *font)
|
||||
const struct nk_user_font *font, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
int was_active;
|
||||
struct nk_rect bounds;
|
||||
|
|
@ -136,8 +138,37 @@ nk_do_toggle(nk_flags *state,
|
|||
/* calculate the selector space */
|
||||
select.w = font->height;
|
||||
select.h = select.w;
|
||||
select.y = r.y + r.h/2.0f - select.h/2.0f;
|
||||
select.x = r.x;
|
||||
|
||||
if (widget_alignment & NK_WIDGET_ALIGN_RIGHT) {
|
||||
select.x = r.x + r.w - font->height;
|
||||
|
||||
/* label in front of the selector */
|
||||
label.x = r.x;
|
||||
label.w = r.w - select.w - style->spacing * 2;
|
||||
} else if (widget_alignment & NK_WIDGET_ALIGN_CENTERED) {
|
||||
select.x = r.x + (r.w - select.w) / 2;
|
||||
|
||||
/* label in front of selector */
|
||||
label.x = r.x;
|
||||
label.w = (r.w - select.w - style->spacing * 2) / 2;
|
||||
} else { /* Default: NK_WIDGET_ALIGN_LEFT */
|
||||
select.x = r.x;
|
||||
|
||||
/* label behind the selector */
|
||||
label.x = select.x + select.w + style->spacing;
|
||||
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
|
||||
}
|
||||
|
||||
if (widget_alignment & NK_WIDGET_ALIGN_TOP) {
|
||||
select.y = r.y;
|
||||
} else if (widget_alignment & NK_WIDGET_ALIGN_BOTTOM) {
|
||||
select.y = r.y + r.h - select.h - 2 * style->padding.y;
|
||||
} else { /* Default: NK_WIDGET_ALIGN_MIDDLE */
|
||||
select.y = r.y + r.h/2.0f - select.h/2.0f;
|
||||
}
|
||||
|
||||
label.y = select.y;
|
||||
label.h = select.w;
|
||||
|
||||
/* calculate the bounds of the cursor inside the selector */
|
||||
cursor.x = select.x + style->padding.x + style->border;
|
||||
|
|
@ -145,12 +176,6 @@ nk_do_toggle(nk_flags *state,
|
|||
cursor.w = select.w - (2 * style->padding.x + 2 * style->border);
|
||||
cursor.h = select.h - (2 * style->padding.y + 2 * style->border);
|
||||
|
||||
/* label behind the selector */
|
||||
label.x = select.x + select.w + style->spacing;
|
||||
label.y = select.y;
|
||||
label.w = NK_MAX(r.x + r.w, label.x) - label.x;
|
||||
label.h = select.w;
|
||||
|
||||
/* update selector */
|
||||
was_active = *active;
|
||||
*active = nk_toggle_behavior(in, bounds, state, *active);
|
||||
|
|
@ -159,9 +184,9 @@ nk_do_toggle(nk_flags *state,
|
|||
if (style->draw_begin)
|
||||
style->draw_begin(out, style->userdata);
|
||||
if (type == NK_TOGGLE_CHECK) {
|
||||
nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font);
|
||||
nk_draw_checkbox(out, *state, style, *active, &label, &select, &cursor, str, len, font, text_alignment);
|
||||
} else {
|
||||
nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font);
|
||||
nk_draw_option(out, *state, style, *active, &label, &select, &cursor, str, len, font, text_alignment);
|
||||
}
|
||||
if (style->draw_end)
|
||||
style->draw_end(out, style->userdata);
|
||||
|
|
@ -195,9 +220,37 @@ nk_check_text(struct nk_context *ctx, const char *text, int len, nk_bool active)
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return active;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active,
|
||||
text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font);
|
||||
text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, NK_WIDGET_LEFT, NK_TEXT_LEFT);
|
||||
return active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_check_text_align(struct nk_context *ctx, const char *text, int len, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
struct nk_window *win;
|
||||
struct nk_panel *layout;
|
||||
const struct nk_input *in;
|
||||
const struct nk_style *style;
|
||||
|
||||
struct nk_rect bounds;
|
||||
enum nk_widget_layout_states state;
|
||||
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(ctx->current);
|
||||
NK_ASSERT(ctx->current->layout);
|
||||
if (!ctx || !ctx->current || !ctx->current->layout)
|
||||
return active;
|
||||
|
||||
win = ctx->current;
|
||||
style = &ctx->style;
|
||||
layout = win->layout;
|
||||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return active;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &active,
|
||||
text, len, NK_TOGGLE_CHECK, &style->checkbox, in, style->font, widget_alignment, text_alignment);
|
||||
return active;
|
||||
}
|
||||
NK_API unsigned int
|
||||
|
|
@ -227,6 +280,18 @@ nk_checkbox_text(struct nk_context *ctx, const char *text, int len, nk_bool *act
|
|||
return old_val != *active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_checkbox_text_align(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
int old_val;
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(text);
|
||||
NK_ASSERT(active);
|
||||
if (!ctx || !text || !active) return 0;
|
||||
old_val = *active;
|
||||
*active = nk_check_text_align(ctx, text, len, *active, widget_alignment, text_alignment);
|
||||
return old_val != *active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_checkbox_flags_text(struct nk_context *ctx, const char *text, int len,
|
||||
unsigned int *flags, unsigned int value)
|
||||
{
|
||||
|
|
@ -257,6 +322,10 @@ NK_API nk_bool nk_checkbox_label(struct nk_context *ctx, const char *label, nk_b
|
|||
{
|
||||
return nk_checkbox_text(ctx, label, nk_strlen(label), active);
|
||||
}
|
||||
NK_API nk_bool nk_checkbox_label_align(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
return nk_checkbox_text_align(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
|
||||
}
|
||||
NK_API nk_bool nk_checkbox_flags_label(struct nk_context *ctx, const char *label,
|
||||
unsigned int *flags, unsigned int value)
|
||||
{
|
||||
|
|
@ -290,9 +359,37 @@ nk_option_text(struct nk_context *ctx, const char *text, int len, nk_bool is_act
|
|||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return (int)state;
|
||||
in = (state == NK_WIDGET_ROM || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active,
|
||||
text, len, NK_TOGGLE_OPTION, &style->option, in, style->font);
|
||||
text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, NK_WIDGET_LEFT, NK_TEXT_LEFT);
|
||||
return is_active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_option_text_align(struct nk_context *ctx, const char *text, int len, nk_bool is_active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
struct nk_window *win;
|
||||
struct nk_panel *layout;
|
||||
const struct nk_input *in;
|
||||
const struct nk_style *style;
|
||||
|
||||
struct nk_rect bounds;
|
||||
enum nk_widget_layout_states state;
|
||||
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(ctx->current);
|
||||
NK_ASSERT(ctx->current->layout);
|
||||
if (!ctx || !ctx->current || !ctx->current->layout)
|
||||
return is_active;
|
||||
|
||||
win = ctx->current;
|
||||
style = &ctx->style;
|
||||
layout = win->layout;
|
||||
|
||||
state = nk_widget(&bounds, ctx);
|
||||
if (!state) return (int)state;
|
||||
in = (state == NK_WIDGET_ROM || state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
|
||||
nk_do_toggle(&ctx->last_widget_state, &win->buffer, bounds, &is_active,
|
||||
text, len, NK_TOGGLE_OPTION, &style->option, in, style->font, widget_alignment, text_alignment);
|
||||
return is_active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
|
|
@ -308,13 +405,35 @@ nk_radio_text(struct nk_context *ctx, const char *text, int len, nk_bool *active
|
|||
return old_value != *active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_radio_text_align(struct nk_context *ctx, const char *text, int len, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
int old_value;
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(text);
|
||||
NK_ASSERT(active);
|
||||
if (!ctx || !text || !active) return 0;
|
||||
old_value = *active;
|
||||
*active = nk_option_text_align(ctx, text, len, old_value, widget_alignment, text_alignment);
|
||||
return old_value != *active;
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_option_label(struct nk_context *ctx, const char *label, nk_bool active)
|
||||
{
|
||||
return nk_option_text(ctx, label, nk_strlen(label), active);
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_option_label_align(struct nk_context *ctx, const char *label, nk_bool active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
return nk_option_text_align(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_radio_label(struct nk_context *ctx, const char *label, nk_bool *active)
|
||||
{
|
||||
return nk_radio_text(ctx, label, nk_strlen(label), active);
|
||||
}
|
||||
NK_API nk_bool
|
||||
nk_radio_label_align(struct nk_context *ctx, const char *label, nk_bool *active, nk_flags widget_alignment, nk_flags text_alignment)
|
||||
{
|
||||
return nk_radio_text_align(ctx, label, nk_strlen(label), active, widget_alignment, text_alignment);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,15 +52,15 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, header, &background->data.image, nk_white);
|
||||
nk_draw_image(out, header, &background->data.image, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, header, 0, style->tab.border_color);
|
||||
nk_fill_rect(out, header, 0, nk_rgb_factor(style->tab.border_color, style->tab.color_factor));
|
||||
nk_fill_rect(out, nk_shrink_rect(header, style->tab.border),
|
||||
style->tab.rounding, background->data.color);
|
||||
style->tab.rounding, nk_rgb_factor(background->data.color, style->tab.color_factor));
|
||||
break;
|
||||
}
|
||||
} else text.background = style->window.background;
|
||||
|
|
@ -105,7 +105,7 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
label.y = sym.y;
|
||||
label.w = header.w - (sym.w + item_spacing.y + style->tab.indent);
|
||||
label.h = style->font->height;
|
||||
text.text = style->tab.text;
|
||||
text.text = nk_rgb_factor(style->tab.text, style->tab.color_factor);
|
||||
text.padding = nk_vec2(0,0);
|
||||
nk_widget_text(out, label, title, nk_strlen(title), &text,
|
||||
NK_TEXT_LEFT, style->font);}
|
||||
|
|
@ -242,15 +242,16 @@ nk_tree_element_image_push_hashed_base(struct nk_context *ctx, enum nk_tree_type
|
|||
|
||||
switch (background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, header, &background->data.image, nk_white);
|
||||
nk_draw_image(out, header, &background->data.image, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, header, 0, style->tab.border_color);
|
||||
nk_fill_rect(out, header, 0, nk_rgb_factor(style->tab.border_color, style->tab.color_factor));
|
||||
nk_fill_rect(out, nk_shrink_rect(header, style->tab.border),
|
||||
style->tab.rounding, background->data.color);
|
||||
style->tab.rounding, nk_rgb_factor(background->data.color, style->tab.color_factor));
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,6 +175,8 @@ nk_widget(struct nk_rect *bounds, const struct nk_context *ctx)
|
|||
nk_unify(&v, &c, bounds->x, bounds->y, bounds->x + bounds->w, bounds->y + bounds->h);
|
||||
if (!NK_INTERSECT(c.x, c.y, c.w, c.h, bounds->x, bounds->y, bounds->w, bounds->h))
|
||||
return NK_WIDGET_INVALID;
|
||||
if (win->widgets_disabled)
|
||||
return NK_WIDGET_DISABLED;
|
||||
if (!NK_INBOX(in->mouse.pos.x, in->mouse.pos.y, v.x, v.y, v.w, v.h))
|
||||
return NK_WIDGET_ROM;
|
||||
return NK_WIDGET_VALID;
|
||||
|
|
@ -227,4 +229,129 @@ nk_spacing(struct nk_context *ctx, int cols)
|
|||
nk_panel_alloc_space(&none, ctx);
|
||||
} layout->row.index = index;
|
||||
}
|
||||
NK_API void
|
||||
nk_widget_disable_begin(struct nk_context* ctx)
|
||||
{
|
||||
struct nk_window* win;
|
||||
struct nk_style* style;
|
||||
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(ctx->current);
|
||||
|
||||
if (!ctx || !ctx->current)
|
||||
return;
|
||||
|
||||
win = ctx->current;
|
||||
style = &ctx->style;
|
||||
|
||||
win->widgets_disabled = nk_true;
|
||||
|
||||
style->button.color_factor_text = style->button.disabled_factor;
|
||||
style->button.color_factor_background = style->button.disabled_factor;
|
||||
style->chart.color_factor = style->chart.disabled_factor;
|
||||
style->checkbox.color_factor = style->checkbox.disabled_factor;
|
||||
style->combo.color_factor = style->combo.disabled_factor;
|
||||
style->combo.button.color_factor_text = style->combo.button.disabled_factor;
|
||||
style->combo.button.color_factor_background = style->combo.button.disabled_factor;
|
||||
style->contextual_button.color_factor_text = style->contextual_button.disabled_factor;
|
||||
style->contextual_button.color_factor_background = style->contextual_button.disabled_factor;
|
||||
style->edit.color_factor = style->edit.disabled_factor;
|
||||
style->edit.scrollbar.color_factor = style->edit.scrollbar.disabled_factor;
|
||||
style->menu_button.color_factor_text = style->menu_button.disabled_factor;
|
||||
style->menu_button.color_factor_background = style->menu_button.disabled_factor;
|
||||
style->option.color_factor = style->option.disabled_factor;
|
||||
style->progress.color_factor = style->progress.disabled_factor;
|
||||
style->property.color_factor = style->property.disabled_factor;
|
||||
style->property.inc_button.color_factor_text = style->property.inc_button.disabled_factor;
|
||||
style->property.inc_button.color_factor_background = style->property.inc_button.disabled_factor;
|
||||
style->property.dec_button.color_factor_text = style->property.dec_button.disabled_factor;
|
||||
style->property.dec_button.color_factor_background = style->property.dec_button.disabled_factor;
|
||||
style->property.edit.color_factor = style->property.edit.disabled_factor;
|
||||
style->scrollh.color_factor = style->scrollh.disabled_factor;
|
||||
style->scrollh.inc_button.color_factor_text = style->scrollh.inc_button.disabled_factor;
|
||||
style->scrollh.inc_button.color_factor_background = style->scrollh.inc_button.disabled_factor;
|
||||
style->scrollh.dec_button.color_factor_text = style->scrollh.dec_button.disabled_factor;
|
||||
style->scrollh.dec_button.color_factor_background = style->scrollh.dec_button.disabled_factor;
|
||||
style->scrollv.color_factor = style->scrollv.disabled_factor;
|
||||
style->scrollv.inc_button.color_factor_text = style->scrollv.inc_button.disabled_factor;
|
||||
style->scrollv.inc_button.color_factor_background = style->scrollv.inc_button.disabled_factor;
|
||||
style->scrollv.dec_button.color_factor_text = style->scrollv.dec_button.disabled_factor;
|
||||
style->scrollv.dec_button.color_factor_background = style->scrollv.dec_button.disabled_factor;
|
||||
style->selectable.color_factor = style->selectable.disabled_factor;
|
||||
style->slider.color_factor = style->slider.disabled_factor;
|
||||
style->slider.inc_button.color_factor_text = style->slider.inc_button.disabled_factor;
|
||||
style->slider.inc_button.color_factor_background = style->slider.inc_button.disabled_factor;
|
||||
style->slider.dec_button.color_factor_text = style->slider.dec_button.disabled_factor;
|
||||
style->slider.dec_button.color_factor_background = style->slider.dec_button.disabled_factor;
|
||||
style->tab.color_factor = style->tab.disabled_factor;
|
||||
style->tab.node_maximize_button.color_factor_text = style->tab.node_maximize_button.disabled_factor;
|
||||
style->tab.node_minimize_button.color_factor_text = style->tab.node_minimize_button.disabled_factor;
|
||||
style->tab.tab_maximize_button.color_factor_text = style->tab.tab_maximize_button.disabled_factor;
|
||||
style->tab.tab_maximize_button.color_factor_background = style->tab.tab_maximize_button.disabled_factor;
|
||||
style->tab.tab_minimize_button.color_factor_text = style->tab.tab_minimize_button.disabled_factor;
|
||||
style->tab.tab_minimize_button.color_factor_background = style->tab.tab_minimize_button.disabled_factor;
|
||||
style->text.color_factor = style->text.disabled_factor;
|
||||
}
|
||||
NK_API void
|
||||
nk_widget_disable_end(struct nk_context* ctx)
|
||||
{
|
||||
struct nk_window* win;
|
||||
struct nk_style* style;
|
||||
|
||||
NK_ASSERT(ctx);
|
||||
NK_ASSERT(ctx->current);
|
||||
|
||||
if (!ctx || !ctx->current)
|
||||
return;
|
||||
|
||||
win = ctx->current;
|
||||
style = &ctx->style;
|
||||
|
||||
win->widgets_disabled = nk_false;
|
||||
|
||||
style->button.color_factor_text = 1.0f;
|
||||
style->button.color_factor_background = 1.0f;
|
||||
style->chart.color_factor = 1.0f;
|
||||
style->checkbox.color_factor = 1.0f;
|
||||
style->combo.color_factor = 1.0f;
|
||||
style->combo.button.color_factor_text = 1.0f;
|
||||
style->combo.button.color_factor_background = 1.0f;
|
||||
style->contextual_button.color_factor_text = 1.0f;
|
||||
style->contextual_button.color_factor_background = 1.0f;
|
||||
style->edit.color_factor = 1.0f;
|
||||
style->edit.scrollbar.color_factor = 1.0f;
|
||||
style->menu_button.color_factor_text = 1.0f;
|
||||
style->menu_button.color_factor_background = 1.0f;
|
||||
style->option.color_factor = 1.0f;
|
||||
style->progress.color_factor = 1.0f;
|
||||
style->property.color_factor = 1.0f;
|
||||
style->property.inc_button.color_factor_text = 1.0f;
|
||||
style->property.inc_button.color_factor_background = 1.0f;
|
||||
style->property.dec_button.color_factor_text = 1.0f;
|
||||
style->property.dec_button.color_factor_background = 1.0f;
|
||||
style->property.edit.color_factor = 1.0f;
|
||||
style->scrollh.color_factor = 1.0f;
|
||||
style->scrollh.inc_button.color_factor_text = 1.0f;
|
||||
style->scrollh.inc_button.color_factor_background = 1.0f;
|
||||
style->scrollh.dec_button.color_factor_text = 1.0f;
|
||||
style->scrollh.dec_button.color_factor_background = 1.0f;
|
||||
style->scrollv.color_factor = 1.0f;
|
||||
style->scrollv.inc_button.color_factor_text = 1.0f;
|
||||
style->scrollv.inc_button.color_factor_background = 1.0f;
|
||||
style->scrollv.dec_button.color_factor_text = 1.0f;
|
||||
style->scrollv.dec_button.color_factor_background = 1.0f;
|
||||
style->selectable.color_factor = 1.0f;
|
||||
style->slider.color_factor = 1.0f;
|
||||
style->slider.inc_button.color_factor_text = 1.0f;
|
||||
style->slider.inc_button.color_factor_background = 1.0f;
|
||||
style->slider.dec_button.color_factor_text = 1.0f;
|
||||
style->slider.dec_button.color_factor_background = 1.0f;
|
||||
style->tab.color_factor = 1.0f;
|
||||
style->tab.node_maximize_button.color_factor_text = 1.0f;
|
||||
style->tab.node_minimize_button.color_factor_text = 1.0f;
|
||||
style->tab.tab_maximize_button.color_factor_text = 1.0f;
|
||||
style->tab.tab_maximize_button.color_factor_background = 1.0f;
|
||||
style->tab.tab_minimize_button.color_factor_text = 1.0f;
|
||||
style->tab.tab_minimize_button.color_factor_background = 1.0f;
|
||||
style->text.color_factor = 1.0f;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
|
|||
NK_MEMCPY(win->name_string, name, name_length);
|
||||
win->name_string[name_length] = 0;
|
||||
win->popup.win = 0;
|
||||
win->widgets_disabled = nk_false;
|
||||
if (!ctx->active)
|
||||
ctx->active = win;
|
||||
} else {
|
||||
|
|
@ -669,3 +670,12 @@ nk_window_set_focus(struct nk_context *ctx, const char *name)
|
|||
}
|
||||
ctx->active = win;
|
||||
}
|
||||
NK_API void
|
||||
nk_rule_horizontal(struct nk_context *ctx, struct nk_color color, nk_bool rounding)
|
||||
{
|
||||
struct nk_rect space;
|
||||
enum nk_widget_layout_states state = nk_widget(&space, ctx);
|
||||
struct nk_command_buffer *canvas = nk_window_get_canvas(ctx);
|
||||
if (!state) return;
|
||||
nk_fill_rect(canvas, space, rounding && space.h > 1.5f ? space.h / 2.0f : 0, color);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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