Skip to content

Commit 94de2a5

Browse files
committed
Fix demo files breaking due to the API change
1 parent 906df98 commit 94de2a5

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

demo/common/canvas.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ canvas_begin(struct nk_context *ctx, struct nk_canvas *canvas, nk_flags flags,
1313
/* save style properties which will be overwritten */
1414
canvas->panel_padding = ctx->style.window.padding;
1515
canvas->item_spacing = ctx->style.window.spacing;
16-
canvas->window_background = ctx->style.window.fixed_background;
16+
canvas->window_background = ctx->style.window.image;
1717

1818
/* use the complete window space and set background */
1919
ctx->style.window.spacing = nk_vec2(0,0);
2020
ctx->style.window.padding = nk_vec2(0,0);
21-
ctx->style.window.fixed_background = nk_style_item_color(background_color);
21+
ctx->style.window.image = nk_style_item_color(background_color);
2222

2323
/* create/update window and set position + size */
2424
if (!nk_begin(ctx, "Canvas", nk_rect(x, y, width, height), NK_WINDOW_NO_SCROLLBAR|flags))
@@ -42,7 +42,7 @@ canvas_end(struct nk_context *ctx, struct nk_canvas *canvas)
4242
nk_end(ctx);
4343
ctx->style.window.spacing = canvas->panel_padding;
4444
ctx->style.window.padding = canvas->item_spacing;
45-
ctx->style.window.fixed_background = canvas->window_background;
45+
ctx->style.window.image = canvas->window_background;
4646
}
4747

4848
static void

example/canvas.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,12 @@ canvas_begin(struct nk_context *ctx, struct nk_canvas *canvas, nk_flags flags,
364364
/* save style properties which will be overwritten */
365365
canvas->panel_padding = ctx->style.window.padding;
366366
canvas->item_spacing = ctx->style.window.spacing;
367-
canvas->window_background = ctx->style.window.fixed_background;
367+
canvas->window_background = ctx->style.window.image;
368368

369369
/* use the complete window space and set background */
370370
ctx->style.window.spacing = nk_vec2(0,0);
371371
ctx->style.window.padding = nk_vec2(0,0);
372-
ctx->style.window.fixed_background = nk_style_item_color(background_color);
372+
ctx->style.window.image = nk_style_item_color(background_color);
373373

374374
/* create/update window and set position + size */
375375
flags = flags & ~NK_WINDOW_DYNAMIC;
@@ -390,7 +390,7 @@ canvas_end(struct nk_context *ctx, struct nk_canvas *canvas)
390390
nk_end(ctx);
391391
ctx->style.window.spacing = canvas->panel_padding;
392392
ctx->style.window.padding = canvas->item_spacing;
393-
ctx->style.window.fixed_background = canvas->window_background;
393+
ctx->style.window.image = canvas->window_background;
394394
}
395395

396396
int main(int argc, char *argv[])

example/extended.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ ui_piemenu(struct nk_context *ctx, struct nk_vec2 pos, float radius,
8484

8585
/* pie menu popup */
8686
struct nk_color border = ctx->style.window.border_color;
87-
struct nk_style_item background = ctx->style.window.fixed_background;
88-
ctx->style.window.fixed_background = nk_style_item_hide();
87+
struct nk_style_item background = ctx->style.window.image;
88+
ctx->style.window.image = nk_style_item_hide();
8989
ctx->style.window.border_color = nk_rgba(0,0,0,0);
9090

9191
total_space = nk_window_get_content_region(ctx);
@@ -167,7 +167,7 @@ ui_piemenu(struct nk_context *ctx, struct nk_vec2 pos, float radius,
167167
ctx->style.window.padding = nk_vec2(8,8);
168168
nk_popup_end(ctx);
169169

170-
ctx->style.window.fixed_background = background;
170+
ctx->style.window.image = background;
171171
ctx->style.window.border_color = border;
172172
return ret;
173173
}

example/skinning.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int main(int argc, char *argv[])
415415

416416
/* window */
417417
ctx.style.window.background = nk_rgb(204,204,204);
418-
ctx.style.window.fixed_background = nk_style_item_image(media.window);
418+
ctx.style.window.image = nk_style_item_image(media.window);
419419
ctx.style.window.border_color = nk_rgb(67,67,67);
420420
ctx.style.window.combo_border_color = nk_rgb(67,67,67);
421421
ctx.style.window.contextual_border_color = nk_rgb(67,67,67);

0 commit comments

Comments
 (0)