From 831a9c32dac9b22ab03ab1a081546db1dd6aa798 Mon Sep 17 00:00:00 2001 From: vurtun Date: Fri, 29 Jul 2016 23:26:44 +0200 Subject: [PATCH] Update examples to version 1.03 --- example/extended.c | 41 ++++++++++++++++++++--------------------- example/file_browser.c | 12 ++++++------ example/skinning.c | 2 +- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/example/extended.c b/example/extended.c index 4da2ea1..be13ace 100644 --- a/example/extended.c +++ b/example/extended.c @@ -283,9 +283,9 @@ button_demo(struct nk_context *ctx, struct media *media) nk_menu_item_image_label(ctx, media->prev, "Prev", NK_TEXT_RIGHT); nk_menu_end(ctx); } - nk_button_image(ctx, media->tools, NK_BUTTON_DEFAULT); - nk_button_image(ctx, media->cloud, NK_BUTTON_DEFAULT); - nk_button_image(ctx, media->pen, NK_BUTTON_DEFAULT); + nk_button_image(ctx, media->tools); + nk_button_image(ctx, media->cloud); + nk_button_image(ctx, media->pen); } nk_menubar_end(ctx); @@ -294,10 +294,10 @@ button_demo(struct nk_context *ctx, struct media *media) *------------------------------------------------*/ ui_header(ctx, media, "Push buttons"); ui_widget(ctx, media, 35); - if (nk_button_label(ctx, "Push me", NK_BUTTON_DEFAULT)) + if (nk_button_label(ctx, "Push me")) fprintf(stdout, "pushed!\n"); ui_widget(ctx, media, 35); - if (nk_button_image_label(ctx, media->rocket, "Styled", NK_TEXT_CENTERED, NK_BUTTON_DEFAULT)) + if (nk_button_image_label(ctx, media->rocket, "Styled", NK_TEXT_CENTERED)) fprintf(stdout, "rocket!\n"); /*------------------------------------------------ @@ -305,7 +305,7 @@ button_demo(struct nk_context *ctx, struct media *media) *------------------------------------------------*/ ui_header(ctx, media, "Repeater"); ui_widget(ctx, media, 35); - if (nk_button_label(ctx, "Press me", NK_BUTTON_REPEATER)) + if (nk_button_label(ctx, "Press me")) fprintf(stdout, "pressed!\n"); /*------------------------------------------------ @@ -313,30 +313,30 @@ button_demo(struct nk_context *ctx, struct media *media) *------------------------------------------------*/ ui_header(ctx, media, "Toggle buttons"); ui_widget(ctx, media, 35); - if (nk_button_image_label(ctx, (toggle0) ? media->checked: media->unchecked, - "Toggle", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) toggle0 = !toggle0; + if (nk_button_image_label(ctx, (toggle0) ? media->checked: media->unchecked, "Toggle", NK_TEXT_LEFT)) + toggle0 = !toggle0; ui_widget(ctx, media, 35); - if (nk_button_image_label(ctx, (toggle1) ? media->checked: media->unchecked, - "Toggle", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) toggle1 = !toggle1; + if (nk_button_image_label(ctx, (toggle1) ? media->checked: media->unchecked, "Toggle", NK_TEXT_LEFT)) + toggle1 = !toggle1; ui_widget(ctx, media, 35); - if (nk_button_image_label(ctx, (toggle2) ? media->checked: media->unchecked, - "Toggle", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) toggle2 = !toggle2; + if (nk_button_image_label(ctx, (toggle2) ? media->checked: media->unchecked, "Toggle", NK_TEXT_LEFT)) + toggle2 = !toggle2; /*------------------------------------------------ * RADIO *------------------------------------------------*/ ui_header(ctx, media, "Radio buttons"); ui_widget(ctx, media, 35); - if (nk_button_symbol_label(ctx, (option == 0)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, - "Select", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) option = 0; + if (nk_button_symbol_label(ctx, (option == 0)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, "Select", NK_TEXT_LEFT)) + option = 0; ui_widget(ctx, media, 35); - if (nk_button_symbol_label(ctx, (option == 1)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, - "Select", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) option = 1; + if (nk_button_symbol_label(ctx, (option == 1)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, "Select", NK_TEXT_LEFT)) + option = 1; ui_widget(ctx, media, 35); - if (nk_button_symbol_label(ctx, (option == 2)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, - "Select", NK_TEXT_LEFT, NK_BUTTON_DEFAULT)) option = 2; + if (nk_button_symbol_label(ctx, (option == 2)?NK_SYMBOL_CIRCLE_FILLED:NK_SYMBOL_CIRCLE, "Select", NK_TEXT_LEFT)) + option = 2; /*------------------------------------------------ * CONTEXTUAL @@ -389,8 +389,7 @@ basic_demo(struct nk_context *ctx, struct media *media) *------------------------------------------------*/ ui_header(ctx, media, "Popup & Scrollbar & Images"); ui_widget(ctx, media, 35); - if (nk_button_image_label(ctx, media->dir, - "Images", NK_TEXT_CENTERED, NK_BUTTON_DEFAULT)) + if (nk_button_image_label(ctx, media->dir, "Images", NK_TEXT_CENTERED)) image_active = !image_active; /*------------------------------------------------ @@ -408,7 +407,7 @@ basic_demo(struct nk_context *ctx, struct media *media) if (nk_popup_begin(ctx, &popup, NK_POPUP_STATIC, "Image Popup", 0, nk_rect(265, 0, 320, 220))) { nk_layout_row_static(ctx, 82, 82, 3); for (i = 0; i < 9; ++i) { - if (nk_button_image(ctx, media->images[i], NK_BUTTON_DEFAULT)) { + if (nk_button_image(ctx, media->images[i])) { selected_image = i; image_active = 0; nk_popup_close(ctx); diff --git a/example/file_browser.c b/example/file_browser.c index 132c357..20cb8fb 100644 --- a/example/file_browser.c +++ b/example/file_browser.c @@ -418,7 +418,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) while (*d++) { if (*d == '/') { *d = '\0'; - if (nk_button_label(ctx, begin, NK_BUTTON_DEFAULT)) { + if (nk_button_label(ctx, begin)) { *d++ = '/'; *d = '\0'; file_browser_reload_directory_content(browser, browser->directory); break; @@ -441,11 +441,11 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) struct nk_image computer = media->icons.computer; nk_layout_row_dynamic(ctx, 40, 1); - if (nk_button_image_label(ctx, home, "home", NK_TEXT_CENTERED, NK_BUTTON_DEFAULT)) + if (nk_button_image_label(ctx, home, "home", NK_TEXT_CENTERED)) file_browser_reload_directory_content(browser, browser->home); - if (nk_button_image_label(ctx,desktop,"desktop",NK_TEXT_CENTERED, NK_BUTTON_DEFAULT)) + if (nk_button_image_label(ctx,desktop,"desktop",NK_TEXT_CENTERED)) file_browser_reload_directory_content(browser, browser->desktop); - if (nk_button_image_label(ctx,computer,"computer",NK_TEXT_CENTERED,NK_BUTTON_DEFAULT)) + if (nk_button_image_label(ctx,computer,"computer",NK_TEXT_CENTERED)) file_browser_reload_directory_content(browser, "/"); nk_group_end(ctx); } @@ -467,14 +467,14 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) /* draw one row of icons */ if (j < browser->dir_count) { /* draw and execute directory buttons */ - if (nk_button_image(ctx,media->icons.directory,NK_BUTTON_DEFAULT)) + if (nk_button_image(ctx,media->icons.directory)) index = (int)j; } else { /* draw and execute files buttons */ struct nk_image *icon; size_t fileIndex = ((size_t)j - browser->dir_count); icon = media_icon_for_file(media,browser->files[fileIndex]); - if (nk_button_image(ctx, *icon, NK_BUTTON_DEFAULT)) { + if (nk_button_image(ctx, *icon)) { strncpy(browser->file, browser->directory, MAX_PATH_LEN); n = strlen(browser->file); strncpy(browser->file + n, browser->files[fileIndex], MAX_PATH_LEN - n); diff --git a/example/skinning.c b/example/skinning.c index 13e00c1..e8a9b39 100644 --- a/example/skinning.c +++ b/example/skinning.c @@ -735,7 +735,7 @@ int main(int argc, char *argv[]) const float step = (2*3.141592654f) / 32; nk_layout_row_static(&ctx, 30, 120, 1); - if (nk_button_label(&ctx, "button", NK_BUTTON_DEFAULT)) + if (nk_button_label(&ctx, "button")) fprintf(stdout, "button pressed\n"); nk_layout_row_dynamic(&ctx, 20, 1);