From 4cfea495226f22121e2e8820dcb871d066d021d4 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 25 Apr 2024 16:37:07 -0400 Subject: [PATCH] Remove STYLE_ defines as we have the style dropdown --- demo/allegro5/main.c | 14 -------------- demo/d3d11/main.c | 14 -------------- demo/d3d12/main.c | 14 -------------- demo/d3d9/main.c | 14 -------------- demo/gdi/main.c | 14 -------------- demo/gdip/main.c | 14 -------------- demo/glfw_opengl2/main.c | 13 ------------- demo/glfw_opengl3/main.c | 13 ------------- demo/glfw_opengl4/main.c | 13 ------------- demo/glfw_vulkan/main.c | 14 -------------- demo/rawfb/x11/main.c | 13 ------------- demo/sdl_opengl2/main.c | 13 ------------- demo/sdl_opengl3/main.c | 14 -------------- demo/sdl_opengles2/main.c | 14 -------------- demo/sdl_renderer/main.c | 14 +------------- demo/sfml_opengl2/main.cpp | 14 -------------- demo/sfml_opengl3/main.cpp | 14 -------------- demo/x11/main.c | 13 ------------- demo/x11_opengl2/main.c | 13 ------------- demo/x11_opengl3/main.c | 13 ------------- demo/x11_xft/main.c | 13 ------------- 21 files changed, 1 insertion(+), 284 deletions(-) diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index ee01de7..8bb9627 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -114,20 +114,6 @@ int main(void) 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) { bool get_event; diff --git a/demo/d3d11/main.c b/demo/d3d11/main.c index 338dde2..4c96cf6 100644 --- a/demo/d3d11/main.c +++ b/demo/d3d11/main.c @@ -208,20 +208,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/d3d12/main.c b/demo/d3d12/main.c index 57e7bc3..26695c7 100644 --- a/demo/d3d12/main.c +++ b/demo/d3d12/main.c @@ -300,20 +300,6 @@ int main(void) /* Now we can cleanup all resources consumed by font stashing that are no longer used */ 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; while (running) { diff --git a/demo/d3d9/main.c b/demo/d3d9/main.c index 638c584..45503f1 100644 --- a/demo/d3d9/main.c +++ b/demo/d3d9/main.c @@ -214,20 +214,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/gdi/main.c b/demo/gdi/main.c index 281f82b..57273ca 100644 --- a/demo/gdi/main.c +++ b/demo/gdi/main.c @@ -113,20 +113,6 @@ int main(void) font = nk_gdifont_create("Arial", 14); 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) { /* Input */ diff --git a/demo/gdip/main.c b/demo/gdip/main.c index 7151964..b2ab449 100644 --- a/demo/gdip/main.c +++ b/demo/gdip/main.c @@ -109,20 +109,6 @@ int main(void) font = nk_gdipfont_create("Arial", 12); 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) { /* Input */ diff --git a/demo/glfw_opengl2/main.c b/demo/glfw_opengl2/main.c index 8d97773..0b7c88b 100644 --- a/demo/glfw_opengl2/main.c +++ b/demo/glfw_opengl2/main.c @@ -120,19 +120,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; #ifdef INCLUDE_FILE_BROWSER diff --git a/demo/glfw_opengl3/main.c b/demo/glfw_opengl3/main.c index 8eb749d..75596b0 100644 --- a/demo/glfw_opengl3/main.c +++ b/demo/glfw_opengl3/main.c @@ -125,19 +125,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (!glfwWindowShouldClose(win)) { diff --git a/demo/glfw_opengl4/main.c b/demo/glfw_opengl4/main.c index 176a1ef..3b4c863 100644 --- a/demo/glfw_opengl4/main.c +++ b/demo/glfw_opengl4/main.c @@ -125,19 +125,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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. * The index returned is not the opengl resource id. * IF you need the GL resource id use: nk_glfw3_get_tex_ogl_id() */ diff --git a/demo/glfw_vulkan/main.c b/demo/glfw_vulkan/main.c index 071ec31..2293e63 100644 --- a/demo/glfw_vulkan/main.c +++ b/demo/glfw_vulkan/main.c @@ -2104,20 +2104,6 @@ int main(void) { /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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); bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; while (!glfwWindowShouldClose(demo.win)) { diff --git a/demo/rawfb/x11/main.c b/demo/rawfb/x11/main.c index 1f61230..905f43b 100644 --- a/demo/rawfb/x11/main.c +++ b/demo/rawfb/x11/main.c @@ -193,19 +193,6 @@ main(void) rawfb = nk_rawfb_init(fb, tex_scratch, xw.width, xw.height, xw.width * 4, pl); 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) { /* Input */ XEvent evt; diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index 438f2d3..de9dfde 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -116,19 +116,6 @@ main(int argc, char *argv[]) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/sdl_opengl3/main.c b/demo/sdl_opengl3/main.c index 44c8c74..3f27ee7 100644 --- a/demo/sdl_opengl3/main.c +++ b/demo/sdl_opengl3/main.c @@ -126,20 +126,6 @@ int main(int argc, char *argv[]) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index 9ef90a7..be86b12 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -209,20 +209,6 @@ int main(int argc, char* argv[]) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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__) #include emscripten_set_main_loop_arg(MainLoop, (void*)ctx, 0, nk_true); diff --git a/demo/sdl_renderer/main.c b/demo/sdl_renderer/main.c index a4a0f28..4441d4b 100644 --- a/demo/sdl_renderer/main.c +++ b/demo/sdl_renderer/main.c @@ -38,6 +38,7 @@ /*#define INCLUDE_CALCULATOR */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ +/*#define INCLUDE_STYLE */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE @@ -154,19 +155,6 @@ main(int argc, char *argv[]) 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; while (running) { diff --git a/demo/sfml_opengl2/main.cpp b/demo/sfml_opengl2/main.cpp index 82f8e0f..d068854 100644 --- a/demo/sfml_opengl2/main.cpp +++ b/demo/sfml_opengl2/main.cpp @@ -96,20 +96,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; while (win.isOpen()) diff --git a/demo/sfml_opengl3/main.cpp b/demo/sfml_opengl3/main.cpp index 22aafcc..42be2c7 100644 --- a/demo/sfml_opengl3/main.cpp +++ b/demo/sfml_opengl3/main.cpp @@ -102,20 +102,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; while (win.isOpen()) diff --git a/demo/x11/main.c b/demo/x11/main.c index 0d02ad7..7a09b5b 100644 --- a/demo/x11/main.c +++ b/demo/x11/main.c @@ -152,19 +152,6 @@ main(void) xw.font = nk_xfont_create(xw.dpy, "fixed"); 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) { /* Input */ diff --git a/demo/x11_opengl2/main.c b/demo/x11_opengl2/main.c index 2dc845e..352c686 100644 --- a/demo/x11_opengl2/main.c +++ b/demo/x11_opengl2/main.c @@ -256,19 +256,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/x11_opengl3/main.c b/demo/x11_opengl3/main.c index a4a3008..fddae60 100644 --- a/demo/x11_opengl3/main.c +++ b/demo/x11_opengl3/main.c @@ -253,19 +253,6 @@ int main(void) /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ /*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; while (running) { diff --git a/demo/x11_xft/main.c b/demo/x11_xft/main.c index 263f43b..22ece08 100644 --- a/demo/x11_xft/main.c +++ b/demo/x11_xft/main.c @@ -156,19 +156,6 @@ main(void) #endif 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) { /* Input */