Remove STYLE_ defines as we have the style dropdown
This commit is contained in:
parent
2f2474af45
commit
4cfea49522
|
@ -114,20 +114,6 @@ int main(void)
|
||||||
|
|
||||||
ctx = nk_allegro5_init(font, display, WINDOW_WIDTH, WINDOW_HEIGHT);
|
ctx = nk_allegro5_init(font, display, WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
bool get_event;
|
bool get_event;
|
||||||
|
|
|
@ -208,20 +208,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle)*/;}
|
/*nk_style_set_font(ctx, &droid->handle)*/;}
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -300,20 +300,6 @@ int main(void)
|
||||||
/* Now we can cleanup all resources consumed by font stashing that are no longer used */
|
/* Now we can cleanup all resources consumed by font stashing that are no longer used */
|
||||||
nk_d3d12_font_stash_cleanup();
|
nk_d3d12_font_stash_cleanup();
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -214,20 +214,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle)*/;}
|
/*nk_style_set_font(ctx, &droid->handle)*/;}
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -113,20 +113,6 @@ int main(void)
|
||||||
font = nk_gdifont_create("Arial", 14);
|
font = nk_gdifont_create("Arial", 14);
|
||||||
ctx = nk_gdi_init(font, dc, WINDOW_WIDTH, WINDOW_HEIGHT);
|
ctx = nk_gdi_init(font, dc, WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
/* Input */
|
/* Input */
|
||||||
|
|
|
@ -109,20 +109,6 @@ int main(void)
|
||||||
font = nk_gdipfont_create("Arial", 12);
|
font = nk_gdipfont_create("Arial", 12);
|
||||||
nk_gdip_set_font(font);
|
nk_gdip_set_font(font);
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
/* Input */
|
/* Input */
|
||||||
|
|
|
@ -120,19 +120,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
|
|
||||||
#ifdef INCLUDE_FILE_BROWSER
|
#ifdef INCLUDE_FILE_BROWSER
|
||||||
|
|
|
@ -125,19 +125,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (!glfwWindowShouldClose(win))
|
while (!glfwWindowShouldClose(win))
|
||||||
{
|
{
|
||||||
|
|
|
@ -125,19 +125,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Create bindless texture.
|
/* Create bindless texture.
|
||||||
* The index returned is not the opengl resource id.
|
* The index returned is not the opengl resource id.
|
||||||
* IF you need the GL resource id use: nk_glfw3_get_tex_ogl_id() */
|
* IF you need the GL resource id use: nk_glfw3_get_tex_ogl_id() */
|
||||||
|
|
|
@ -2104,20 +2104,6 @@ int main(void) {
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for
|
|
||||||
* anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
img = nk_image_ptr(demo.demo_texture_image_view);
|
img = nk_image_ptr(demo.demo_texture_image_view);
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (!glfwWindowShouldClose(demo.win)) {
|
while (!glfwWindowShouldClose(demo.win)) {
|
||||||
|
|
|
@ -193,19 +193,6 @@ main(void)
|
||||||
rawfb = nk_rawfb_init(fb, tex_scratch, xw.width, xw.height, xw.width * 4, pl);
|
rawfb = nk_rawfb_init(fb, tex_scratch, xw.width, xw.height, xw.width * 4, pl);
|
||||||
if (!rawfb) running = 0;
|
if (!rawfb) running = 0;
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(&rawfb->ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(&rawfb->ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(&rawfb->ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(&rawfb->ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (running) {
|
while (running) {
|
||||||
/* Input */
|
/* Input */
|
||||||
XEvent evt;
|
XEvent evt;
|
||||||
|
|
|
@ -116,19 +116,6 @@ main(int argc, char *argv[])
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &roboto->handle)*/;}
|
/*nk_style_set_font(ctx, &roboto->handle)*/;}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -126,20 +126,6 @@ int main(int argc, char *argv[])
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &roboto->handle);*/}
|
/*nk_style_set_font(ctx, &roboto->handle);*/}
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -209,20 +209,6 @@ int main(int argc, char* argv[])
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &roboto->handle)*/;}
|
/*nk_style_set_font(ctx, &roboto->handle)*/;}
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__EMSCRIPTEN__)
|
#if defined(__EMSCRIPTEN__)
|
||||||
#include <emscripten.h>
|
#include <emscripten.h>
|
||||||
emscripten_set_main_loop_arg(MainLoop, (void*)ctx, 0, nk_true);
|
emscripten_set_main_loop_arg(MainLoop, (void*)ctx, 0, nk_true);
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
/*#define INCLUDE_CALCULATOR */
|
/*#define INCLUDE_CALCULATOR */
|
||||||
/*#define INCLUDE_OVERVIEW */
|
/*#define INCLUDE_OVERVIEW */
|
||||||
/*#define INCLUDE_NODE_EDITOR */
|
/*#define INCLUDE_NODE_EDITOR */
|
||||||
|
/*#define INCLUDE_STYLE */
|
||||||
|
|
||||||
#ifdef INCLUDE_ALL
|
#ifdef INCLUDE_ALL
|
||||||
#define INCLUDE_STYLE
|
#define INCLUDE_STYLE
|
||||||
|
@ -154,19 +155,6 @@ main(int argc, char *argv[])
|
||||||
nk_style_set_font(ctx, &font->handle);
|
nk_style_set_font(ctx, &font->handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -96,20 +96,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/
|
/*nk_style_set_font(ctx, &droid->handle);*/
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct nk_colorf bg;
|
struct nk_colorf bg;
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (win.isOpen())
|
while (win.isOpen())
|
||||||
|
|
|
@ -102,20 +102,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/
|
/*nk_style_set_font(ctx, &droid->handle);*/
|
||||||
|
|
||||||
/* style.c */
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct nk_colorf bg;
|
struct nk_colorf bg;
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (win.isOpen())
|
while (win.isOpen())
|
||||||
|
|
|
@ -152,19 +152,6 @@ main(void)
|
||||||
xw.font = nk_xfont_create(xw.dpy, "fixed");
|
xw.font = nk_xfont_create(xw.dpy, "fixed");
|
||||||
ctx = nk_xlib_init(xw.font, xw.dpy, xw.screen, xw.win, xw.width, xw.height);
|
ctx = nk_xlib_init(xw.font, xw.dpy, xw.screen, xw.win, xw.width, xw.height);
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
/* Input */
|
/* Input */
|
||||||
|
|
|
@ -256,19 +256,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -253,19 +253,6 @@ int main(void)
|
||||||
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
/*nk_style_load_all_cursors(ctx, atlas->cursors);*/
|
||||||
/*nk_style_set_font(ctx, &droid->handle);*/}
|
/*nk_style_set_font(ctx, &droid->handle);*/}
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
|
|
|
@ -156,19 +156,6 @@ main(void)
|
||||||
#endif
|
#endif
|
||||||
xw.width, xw.height);
|
xw.width, xw.height);
|
||||||
|
|
||||||
#ifdef INCLUDE_STYLE
|
|
||||||
/* ease regression testing during Nuklear release process; not needed for anything else */
|
|
||||||
#ifdef STYLE_WHITE
|
|
||||||
set_style(ctx, THEME_WHITE);
|
|
||||||
#elif defined(STYLE_RED)
|
|
||||||
set_style(ctx, THEME_RED);
|
|
||||||
#elif defined(STYLE_BLUE)
|
|
||||||
set_style(ctx, THEME_BLUE);
|
|
||||||
#elif defined(STYLE_DARK)
|
|
||||||
set_style(ctx, THEME_DARK);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
/* Input */
|
/* Input */
|
||||||
|
|
Loading…
Reference in New Issue